[Conky-commits] SF.net SVN: conky: [697] trunk/conky1

[<pk...@us...>]

Revision: 697
Author:   pkovacs
Date:     2006-08-27 12:03:52 -0700 (Sun, 27 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/conky/?rev=697&view=rev

Log Message:
-----------
fixed compilation errors with --disable-x11; bug #1547164

Modified Paths:
--------------
    trunk/conky1/ChangeLog
    trunk/conky1/README
    trunk/conky1/doc/conky.1
    trunk/conky1/src/conky.c

Property Changed:
----------------
    trunk/conky1/vim/syntax/conkyrc.vim
Modified: trunk/conky1/ChangeLog
===================================================================
--- trunk/conky1/ChangeLog	2006-08-24 18:14:22 UTC (rev 696)
+++ trunk/conky1/ChangeLog	2006-08-27 19:03:52 UTC (rev 697)
@@ -1,5 +1,8 @@
 # $Id$
 
+2006-08-27
+	* Fix compilation errors when building with --diable-x11; bug #1547164
+
 2006-08-12
 	* Make configure script print summary info
 	* Make `conky -v` show compiled-in features

Modified: trunk/conky1/README
===================================================================
--- trunk/conky1/README	2006-08-24 18:14:22 UTC (rev 696)
+++ trunk/conky1/README	2006-08-27 19:03:52 UTC (rev 697)
@@ -474,8 +474,8 @@
 
        cpu (cpuN)
 	      CPU usage in percents. For SMP machines, the CPU number  can  be
-	      provided as an argument. cpu0 is the total usage, and >=cpu1 are
-	      individual CPUs.
+	      provided	as an argument. ${cpu 0} is the total usage, and ${cpu
+	      X} (X >= 1) are individual CPUs.
 
 
        cpubar (cpu number) (height),(width)

Modified: trunk/conky1/doc/conky.1
===================================================================
--- trunk/conky1/doc/conky.1	2006-08-24 18:14:22 UTC (rev 696)
+++ trunk/conky1/doc/conky.1	2006-08-27 19:03:52 UTC (rev 697)
@@ -446,7 +446,7 @@
 
 .TP 
 \fB\*(T<\fBcpu\fR\*(T>\fR \*(T<\fB(cpuN)\fR\*(T> 
-CPU usage in percents. For SMP machines, the CPU number can be provided as an argument. cpu0 is the total usage, and >=cpu1 are individual CPUs. 
+CPU usage in percents. For SMP machines, the CPU number can be provided as an argument. ${cpu 0} is the total usage, and ${cpu X} (X >= 1) are individual CPUs. 
 
 .TP 
 \fB\*(T<\fBcpubar\fR\*(T>\fR \*(T<\fB(cpu number) (height),(width)\fR\*(T> 

Modified: trunk/conky1/src/conky.c
===================================================================
--- trunk/conky1/src/conky.c	2006-08-24 18:14:22 UTC (rev 696)
+++ trunk/conky1/src/conky.c	2006-08-27 19:03:52 UTC (rev 697)
@@ -328,8 +328,8 @@
 static int minimum_width, minimum_height;
 static int maximum_width;
 
+#endif /* X11 */
 
-
 #ifdef HAVE_ICONV
 #define CODEPAGE_LENGTH 20
 long iconv_selected;
@@ -376,8 +376,6 @@
 /* UTF-8 */
 int utf8_mode = 0;
 
-#endif /* X11 */
-
 /* no buffers in used memory? */
 int no_buffers;
 


Property changes on: trunk/conky1/vim/syntax/conkyrc.vim
___________________________________________________________________
Name: svn:keywords
   + ID


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.