Refactor and fix a couple leaks

1 files changed, 9 insertions, 8 deletions

diff --git a/src/comet.c b/src/comet.c
index 34c9b2a..9e7f46c 100644
--- a/src/comet.c
+++ b/src/comet.c
@@ -53,7 +53,7 @@ static gboolean disk_update(gpointer data)
     size_t len2 = g_utf8_strlen(btn->text, -1);
 
     log_debug("Updated disk percentage");
-    state_request_redraw(btn->action_data, len1 != len2);
+    state_request_redraw(btn->data, len1 != len2);
     return G_SOURCE_CONTINUE;
 }
 
@@ -76,7 +76,7 @@ static gboolean temp_update(gpointer data)
     size_t len2 = g_utf8_strlen(btn->text, -1);
 
     log_debug("Updated temperature");
-    state_request_redraw(btn->action_data, len1 != len2);
+    state_request_redraw(btn->data, len1 != len2);
     return G_SOURCE_CONTINUE;
 }
 
@@ -119,7 +119,7 @@ static gboolean cpu_update(gpointer data)
         button_simple_set_text((gpointer)btn, perc, btn->text_color);
 
         size_t len2 = g_utf8_strlen(btn->text, -1);
-        state_request_redraw(btn->action_data, len1 != len2);
+        state_request_redraw(btn->data, len1 != len2);
     }
 
     log_debug("%s cpu percentage", perc != NULL ? "Updated" : "Unchanged");
@@ -150,7 +150,7 @@ static gboolean ram_update(gpointer data)
     size_t len2 = g_utf8_strlen(btn->text, -1);
 
     log_debug("Updated ram percentage");
-    state_request_redraw(btn->action_data, len1 != len2);
+    state_request_redraw(btn->data, len1 != len2);
     return G_SOURCE_CONTINUE;
 }
 
@@ -170,7 +170,7 @@ static gboolean date_update(gpointer data)
     struct {
         State *state;
         timer_t timer;
-    } *date_ctx = btn->action_data;
+    } *date_ctx = btn->data;
 
     log_debug("Updated date and time");
     state_request_redraw(date_ctx->state, len1 != len2);
@@ -194,7 +194,7 @@ static void show_action(Button *btn)
 static void quit_action(Button *btn)
 {
     log_info("Quit button pressed");
-    g_main_loop_quit(CAST(btn, ButtonSimple)->action_data);
+    g_main_loop_quit(CAST(btn, ButtonSimple)->data);
 }
 
 static void menu_action(Button *btn)
@@ -205,7 +205,7 @@ static void menu_action(Button *btn)
         char *strings[2];
         GList *toggled;
         State *state;
-    } *menu_ctx = sbtn->action_data;
+    } *menu_ctx = sbtn->data;
 
     // NOTE: To close the menu the toggle button must be inside
 
@@ -389,8 +389,9 @@ int main(int argc, char **argv)
     g_source_remove(source_term);
     g_source_remove(source_int);
 
+    // NOTE: Skip the first element (the open/close button)
+    g_list_free_full(menu_ctx.toggled->next, (GDestroyNotify)button_destroy);
     timer_delete(date_ctx.timer);
-    g_list_free(menu_ctx.toggled);
 
     // Buttons are freed by state_destroy
     dwm_destroy(dwm);