Fix some leaks and refactor

1 files changed, 9 insertions, 8 deletions

diff --git a/src/comet.c b/src/comet.c
index 9e7f46c..019444a 100644
--- a/src/comet.c
+++ b/src/comet.c
@@ -158,14 +158,14 @@ static gboolean date_update(gpointer data)
 {
     ButtonSimple *btn = data;
 
-    GDateTime *time = g_date_time_new_now_local();
-    char *date = g_date_time_format(time, "%A %d    %H:%M");
-    g_assert(date != NULL);
+    GDateTime *dt = g_date_time_new_now_local();
+    char *text = g_date_time_format(dt, "%A %d    %H:%M");
+    g_date_time_unref(dt);
 
+    g_assert_nonnull(text);
     size_t len1 = g_utf8_strlen(btn->text, -1);
-
-    button_simple_set_text((gpointer)btn, date, btn->text_color);
-    size_t len2 = g_utf8_strlen(btn->text, -1);
+    size_t len2 = g_utf8_strlen(text, -1);
+    button_simple_set_text((gpointer)btn, text, btn->text_color);
 
     struct {
         State *state;
@@ -182,7 +182,6 @@ static gboolean date_update(gpointer data)
     its.it_value.tv_sec = 60 - (current.tv_sec % 60);
     timer_settime(date_ctx->timer, 0, &its, NULL);
 
-    g_date_time_unref(time);
     return G_SOURCE_CONTINUE;
 }
 
@@ -391,13 +390,15 @@ int main(int argc, char **argv)
 
     // NOTE: Skip the first element (the open/close button)
     g_list_free_full(menu_ctx.toggled->next, (GDestroyNotify)button_destroy);
+    g_free(menu_ctx.toggled);
     timer_delete(date_ctx.timer);
 
-    // Buttons are freed by state_destroy
+    // NOTE: Buttons are freed by state_destroy
     dwm_destroy(dwm);
     state_destroy(state);
     draw_destroy(draw);
     window_destroy(win);
+    connect_destroy(con);
 
     return 0;
 }