From: Brenden Matthews Date: Tue, 6 May 2008 22:41:28 +0000 (+0000) Subject: docs; small code simplification X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=a7da3b17bc9df9add4851f9e6c880368d6a4392d;p=monky docs; small code simplification git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1119 7f574dfc-610e-0410-a909-a81674777703 --- diff --git a/README b/README index c7b86c8..886c2af 100644 --- a/README +++ b/README @@ -697,11 +697,11 @@ VARIABLES downspeed net - Download speed in kilobytes + Download speed in KiB downspeedf net - Download speed in kilobytes with one decimal + Download speed in KiB with one decimal downspeedgraph net (height),(width) (gradient colour 1) (gradient @@ -1376,11 +1376,11 @@ VARIABLES upspeed net - Upload speed in kilobytes + Upload speed in KiB upspeedf net - Upload speed in kilobytes with one decimal + Upload speed in KiB with one decimal upspeedgraph net (height),(width) (gradient colour 1) (gradient colour @@ -1575,4 +1575,4 @@ AUTHORS - 2008-03-31 conky(1) + 2008-05-06 conky(1) diff --git a/doc/conky.1 b/doc/conky.1 index a0adf2e..1130c3e 100644 --- a/doc/conky.1 +++ b/doc/conky.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH conky 1 2008-03-31 "" "" +.TH conky 1 2008-05-06 "" "" .SH NAME conky \- A system monitor for X originally based on the torsmo code, but more kickass. It just keeps on given'er. Yeah. .SH SYNOPSIS @@ -657,11 +657,11 @@ Disk protection status, if supported (needs kernel-patch). Prints either "frozen .TP \fB\*(T<\fBdownspeed\fR\*(T>\fR \*(T<\fBnet\fR\*(T> -Download speed in kilobytes +Download speed in KiB .TP \fB\*(T<\fBdownspeedf\fR\*(T>\fR \*(T<\fBnet\fR\*(T> -Download speed in kilobytes with one decimal +Download speed in KiB with one decimal .TP \fB\*(T<\fBdownspeedgraph\fR\*(T>\fR \*(T<\fBnet (height),(width) (gradient colour 1) (gradient colour 2) (scale)\fR\*(T> @@ -1224,11 +1224,11 @@ for debugging .TP \fB\*(T<\fBupspeed\fR\*(T>\fR \*(T<\fBnet\fR\*(T> -Upload speed in kilobytes +Upload speed in KiB .TP \fB\*(T<\fBupspeedf\fR\*(T>\fR \*(T<\fBnet\fR\*(T> -Upload speed in kilobytes with one decimal +Upload speed in KiB with one decimal .TP \fB\*(T<\fBupspeedgraph\fR\*(T>\fR \*(T<\fBnet (height),(width) (gradient colour 1) (gradient colour 2) (scale)\fR\*(T> diff --git a/doc/docs.xml b/doc/docs.xml index 197824d..9808da8 100644 --- a/doc/docs.xml +++ b/doc/docs.xml @@ -16,7 +16,7 @@ Brenden Matthews - 2008-03-31 + 2008-05-06 diff --git a/src/conky.c b/src/conky.c index ea24049..a0c222a 100644 --- a/src/conky.c +++ b/src/conky.c @@ -6566,7 +6566,6 @@ static void draw_string(const char *s) int i, i2, pos, width_of_s; int max = 0; int added; - char space[2]; if (s[0] == '\0') { return; @@ -6583,9 +6582,8 @@ static void draw_string(const char *s) pos = 0; added = 0; - snprintf(space, 2, " "); #ifdef X11 - max = ((text_width - width_of_s) / get_string_width(space)); + max = ((text_width - width_of_s) / get_string_width(" ")); #endif /* X11 */ /* This code looks for tabs in the text and coverts them to spaces. * The trick is getting the correct number of spaces, and not going