Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-05 21:07:52 +00:00
Code Issues Releases Activity

Make templates work with --disable-x11

Browse Source 
part of the template-handling code was in #ifdef X11, which caused conky to dump core when
compiled without x11.

as a bonus, I changed tests !=' ' to !isspace in two places as it was causing strange effects

Signed-off-by: Brenden Matthews <brenden@rty.ca>
This commit is contained in:
Pavel Labath 2009-06-02 16:54:41 +02:00 committed by Brenden Matthews
parent 8540821323
commit 44ead331cd
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/conky.c
View File

@ -3024,7 +3024,7 @@ static char *find_and_replace_templates(const char *inbuf)
if (*(p + 1) == '{') {
p += 2;
templ = p;
while (*p && *p != ' ' && *p != '{' && *p != '}')
while (*p && !isspace(*p) && *p != '{' && *p != '}')
p++;
if (*p == '}')
args = NULL;
@ -3048,10 +3048,8 @@ static char *find_and_replace_templates(const char *inbuf)
}
} else {
templ = p + 1;
while (*p && *p != ' ')
while (*p && !isspace(*p))
p++;
if(*p)
*(p++) = '\0';
args = NULL;
}
tmpl_out = handle_template(templ, args);
@ -7109,16 +7107,17 @@ static void clean_up(void)
XFreeGC(display, window.gc);
free_fonts();
for (i = 0; i < 10; i ++) {
if (template[i]) {
free(template[i]);
template[i] = NULL;
}
}
}
#endif /* X11 */
for (i = 0; i < 10; i ++) {
if (template[i]) {
free(template[i]);
template[i] = NULL;
}
}
free_text_objects(&global_root_object, 0);
if (tmpstring1) {
free(tmpstring1);
@ -7276,16 +7275,6 @@ static void set_default_configurations(void)
#ifdef X11
show_graph_scale = 0;
show_graph_range = 0;
template[0] = strdup("");
template[1] = strdup("");
template[2] = strdup("");
template[3] = strdup("");
template[4] = strdup("");
template[5] = strdup("");
template[6] = strdup("");
template[7] = strdup("");
template[8] = strdup("");
template[9] = strdup("");
draw_shades = 1;
draw_borders = 0;
draw_graph_borders = 1;
@ -7311,6 +7300,17 @@ static void set_default_configurations(void)
info.x11.monitor.current = 0;
#endif /* X11 */
template[0] = strdup("");
template[1] = strdup("");
template[2] = strdup("");
template[3] = strdup("");
template[4] = strdup("");
template[5] = strdup("");
template[6] = strdup("");
template[7] = strdup("");
template[8] = strdup("");
template[9] = strdup("");
free(current_mail_spool);
{
char buf[256];
@ -7591,6 +7591,7 @@ static void load_config_file(const char *f)
CONF_ERR;
}
}
#endif /* X11 */
#define TEMPLATE_CONF(n) \
CONF("template"#n) { \
if (value) { \
@ -7610,7 +7611,6 @@ static void load_config_file(const char *f)
TEMPLATE_CONF(7)
TEMPLATE_CONF(8)
TEMPLATE_CONF(9)
#endif /* X11 */
CONF("imap") {
if (value) {
info.mail = parse_mail_args(IMAP_TYPE, value);