From 0633e854c78d37aa9ca9685561522e63e9136222 Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Tue, 6 Dec 2005 03:33:59 +0000 Subject: [PATCH] sf.net bug 1367745 git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@438 7f574dfc-610e-0410-a909-a81674777703 --- ChangeLog | 5 ++++- src/conky.c | 12 ++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc6581b6..181783c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ # $Id$ -2003-11-30 +2005-12-05 + * Fixed sf.net bug 1367745 + +2005-11-30 * Fixed sf.net bugs 1369607, 1367735 and gentoo bug 113921, all variations of the same array out of bounds issue. * "Fixed" code in fs.c and conky.c to make fs stats match those displayed by df diff --git a/src/conky.c b/src/conky.c index da3462a2..9473fcc4 100644 --- a/src/conky.c +++ b/src/conky.c @@ -2050,10 +2050,18 @@ static void generate_text() get_freq(p, n, "%'.2f", 1000); /* pk */ } OBJ(freq_dyn) { - get_freq_dynamic(p, n, "%.0f", 1 ); /* pk */ + if (use_spacer) { + get_freq_dynamic(p, 6, "%.0f ", 1 ); /* pk */ + } else { + get_freq_dynamic(p, n, "%.0f", 1 ); /* pk */ + } } OBJ(freq_dyn_g) { - get_freq_dynamic(p, n, "%'.2f", 1000); /* pk */ + if (use_spacer) { + get_freq_dynamic(p, 6, "%'.2f ", 1000); /* pk */ + } else { + get_freq_dynamic(p, n, "%'.2f", 1000); /* pk */ + } } OBJ(adt746xcpu) { get_adt746x_cpu(p, n); /* pk */