Extend commit 25680305095bfcedaa46cb017182544183ab743b to the whole cpu object.

[monky] / src / llua.c

diff --git a/src/llua.c b/src/llua.c
index f983376..652bfa0 100644 (file)
--- a/src/llua.c
+++ b/src/llua.c
@@ -4,7 +4,7 @@
  * Conky, a system monitor, based on torsmo
  *
  * Copyright (c) 2009 Toni Spets
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
  *     (see AUTHORS)
  * All rights reserved.
  *
@@ -303,6 +303,14 @@ void llua_close(void)
                free(draw_post_hook);
                draw_post_hook = 0;
        }
+       if (startup_hook) {
+               free(startup_hook);
+               startup_hook = 0;
+       }
+       if (shutdown_hook) {
+               free(shutdown_hook);
+               shutdown_hook = 0;
+       }
        if(!lua_L) return;
        lua_close(lua_L);
        lua_L = NULL;
@@ -398,11 +406,13 @@ void llua_set_number(const char *key, double value)
 
 void llua_set_startup_hook(const char *args)
 {
+       if (startup_hook) free(startup_hook);
        startup_hook = strdup(args);
 }
 
 void llua_set_shutdown_hook(const char *args)
 {
+       if (shutdown_hook) free(shutdown_hook);
        shutdown_hook = strdup(args);
 }
 
@@ -563,9 +573,10 @@ void print_lua_graph(struct text_object *obj, char *p, int p_max_size)
                return;
 
        if (llua_getnumber(obj->data.s, &per)) {
-               new_graph(obj, p, per);
+               new_graph(obj, p, p_max_size, per);
        }
 }
+#endif /* X11 */
 
 void print_lua_gauge(struct text_object *obj, char *p, int p_max_size)
 {
@@ -575,7 +586,6 @@ void print_lua_gauge(struct text_object *obj, char *p, int p_max_size)
                return;
 
        if (llua_getnumber(obj->data.s, &per)) {
-               new_gauge(obj, p, (per/100.0 * 255));
+               new_gauge(obj, p, p_max_size, (per/100.0 * 255));
        }
 }
-#endif /* X11 */