Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 20:44:56 +00:00
Code Issues Releases Activity

Merge branch 'master' of git.omp.am:/home/omp/git/conky

Browse Source
This commit is contained in:
Cesare Tirabassi 2009-07-18 16:00:49 +02:00
commit 806b840646
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/conky.c
View File

@ -2964,7 +2964,7 @@ static struct text_object *construct_text_object(const char *s,
CRIT_ERR(obj, free_at_crash, "to_bytes needs a argument"); CRIT_ERR(obj, free_at_crash, "to_bytes needs a argument");
} }
END OBJ(scroll, 0) END OBJ(scroll, 0)
int n1, n2; int n1 = 0, n2 = 0;
obj->data.scroll.step = 1; obj->data.scroll.step = 1;
if (arg && sscanf(arg, "%u %n", &obj->data.scroll.show, &n1) > 0) { if (arg && sscanf(arg, "%u %n", &obj->data.scroll.show, &n1) > 0) {
@ -7490,6 +7490,7 @@ void clean_up(void *memtofree1, void* memtofree2)
x_initialised = NO; x_initialised = NO;
}else{ }else{
free(fonts); //in set_default_configurations a font is set but not loaded free(fonts); //in set_default_configurations a font is set but not loaded
font_count = -1;
} }
#endif /* X11 */ #endif /* X11 */
@ -7979,7 +7980,7 @@ static void load_config_file(const char *f)
CONF2("out_to_x") { CONF2("out_to_x") {
/* don't listen if X is already initialised or /* don't listen if X is already initialised or
* if we already know we don't want it */ * if we already know we don't want it */
if(x_initialised == NO) { if(x_initialised != YES) {
if (string_to_bool(value)) { if (string_to_bool(value)) {
output_methods &= TO_X; output_methods &= TO_X;
} else { } else {