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

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

Browse Source
This commit is contained in:
Nikolas Garofil 2009-11-08 20:30:50 +01:00
commit 3e4a2cf74e
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conky.c
View File

@ -797,7 +797,7 @@ void generate_text_internal(char *p, int p_max_size,
*/ */
#define DO_JUMP { \ #define DO_JUMP { \
DBGP2("jumping"); \ DBGP2("jumping"); \
obj = obj->sub; \ obj = obj->special_data; \
} }
#define OBJ(a) break; case OBJ_##a: #define OBJ(a) break; case OBJ_##a:

2
src/core.c
View File

@ -1286,6 +1286,8 @@ void free_text_objects(struct text_object *root, int internal)
case OBJ_font: case OBJ_font:
case OBJ_image: case OBJ_image:
case OBJ_eval: case OBJ_eval:
free(data.s);
break;
case OBJ_exec: case OBJ_exec:
case OBJ_execbar: case OBJ_execbar:
#ifdef X11 #ifdef X11

4
src/text_object.c
View File

@ -107,7 +107,7 @@ static int push_ifblock(struct ifblock_stack_obj **ifblock_stack_top,
case IFBLOCK_ENDIF: case IFBLOCK_ENDIF:
if (!(*ifblock_stack_top)) if (!(*ifblock_stack_top))
CRIT_ERR(NULL, NULL, "got an endif without matching if"); CRIT_ERR(NULL, NULL, "got an endif without matching if");
(*ifblock_stack_top)->obj->sub = obj; (*ifblock_stack_top)->obj->special_data = obj;
/* if there's some else in between, remove and free it */ /* if there's some else in between, remove and free it */
if ((*ifblock_stack_top)->type == IFBLOCK_ELSE) { if ((*ifblock_stack_top)->type == IFBLOCK_ELSE) {
stackobj = *ifblock_stack_top; stackobj = *ifblock_stack_top;
@ -122,7 +122,7 @@ static int push_ifblock(struct ifblock_stack_obj **ifblock_stack_top,
case IFBLOCK_ELSE: case IFBLOCK_ELSE:
if (!(*ifblock_stack_top)) if (!(*ifblock_stack_top))
CRIT_ERR(NULL, NULL, "got an else without matching if"); CRIT_ERR(NULL, NULL, "got an else without matching if");
(*ifblock_stack_top)->obj->sub = obj; (*ifblock_stack_top)->obj->special_data = obj;
/* fall through */ /* fall through */
case IFBLOCK_IF: case IFBLOCK_IF:
stackobj = malloc(sizeof(struct ifblock_stack_obj)); stackobj = malloc(sizeof(struct ifblock_stack_obj));