Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 18:45:10 +00:00
Code Issues Releases Activity

* Fixed bug with $if_empty and $mpd_* vars (sf.net #2008752)

Browse Source 
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@1225 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
Brenden Matthews 2008-07-17 02:38:04 +00:00
parent ae4bd7cdf9
commit 69ff93d0ea
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
# $Id$ # $Id$
2008-07-16
* Fixed bug with $if_empty and $mpd_* vars (sf.net #2008752)
2008-07-06 2008-07-06
* Made log/normal argument for graphs optional * Made log/normal argument for graphs optional

17
src/conky.c
View File

@ -2075,7 +2075,10 @@ static struct text_object *new_text_object_internal(void)
return obj; return obj;
} }
static void free_text_objects(struct text_object_list *text_object_list) /*
* call with full == 0 when freeing after 'internal' evaluation of objects
*/
static void free_text_objects(struct text_object_list *text_object_list, char full)
{ {
unsigned int i; unsigned int i;
struct text_object *obj; struct text_object *obj;
@ -2377,7 +2380,9 @@ static void free_text_objects(struct text_object_list *text_object_list)
case OBJ_mpd_file: case OBJ_mpd_file:
case OBJ_mpd_percent: case OBJ_mpd_percent:
case OBJ_mpd_smart: case OBJ_mpd_smart:
if (full) {
free_mpd_vars(&info.mpd); free_mpd_vars(&info.mpd);
}
break; break;
#endif #endif
case OBJ_scroll: case OBJ_scroll:
@ -4219,7 +4224,7 @@ static struct text_object_list *extract_variable_text_internal(const char *const
static void extract_variable_text(const char *p) static void extract_variable_text(const char *p)
{ {
free_text_objects(global_text_object_list); free_text_objects(global_text_object_list, 1);
free(global_text_object_list); free(global_text_object_list);
if (tmpstring1) { if (tmpstring1) {
free(tmpstring1); free(tmpstring1);
@ -5001,7 +5006,7 @@ static void generate_text_internal(char *p, int p_max_size,
memcpy(tmp_info, cur, sizeof(struct information)); memcpy(tmp_info, cur, sizeof(struct information));
text_objects = parse_conky_vars(p, p, tmp_info); text_objects = parse_conky_vars(p, p, tmp_info);
free_text_objects(text_objects); free_text_objects(text_objects, 0);
free(text_objects); free(text_objects);
free(tmp_info); free(tmp_info);
} }
@ -5099,7 +5104,7 @@ static void generate_text_internal(char *p, int p_max_size,
text_objects = parse_conky_vars(obj->data.execi.buffer, p, tmp_info); text_objects = parse_conky_vars(obj->data.execi.buffer, p, tmp_info);
obj->data.execi.last_update = current_update_time; obj->data.execi.last_update = current_update_time;
} }
free_text_objects(text_objects); free_text_objects(text_objects, 0);
free(text_objects); free(text_objects);
free(tmp_info); free(tmp_info);
} }
@ -5415,7 +5420,7 @@ static void generate_text_internal(char *p, int p_max_size,
if_jumped = 0; if_jumped = 0;
} }
p[0] = '\0'; p[0] = '\0';
free_text_objects(text_objects); free_text_objects(text_objects, 0);
free(text_objects); free(text_objects);
free(tmp_info); free(tmp_info);
} }
@ -7804,7 +7809,7 @@ void clean_up(void)
free_fonts(); free_fonts();
#endif /* X11 */ #endif /* X11 */
free_text_objects(global_text_object_list); free_text_objects(global_text_object_list, 1);
free(global_text_object_list); free(global_text_object_list);
global_text_object_list = NULL; global_text_object_list = NULL;
if (tmpstring1) { if (tmpstring1) {