1 files changed, 13 insertions, 13 deletions

diff --git a/swaynag/main.c b/swaynag/main.c
index 2ce37831..634bddbf 100644
--- a/swaynag/main.c
+++ b/swaynag/main.c
@@ -1,4 +1,3 @@
-#define _POSIX_C_SOURCE 200809L
 #include <stdlib.h>
 #include <signal.h>
 #include "log.h"
@@ -29,10 +28,12 @@ int main(int argc, char **argv) {
         wl_list_init(&swaynag.outputs);
         wl_list_init(&swaynag.seats);
 
-        struct swaynag_button button_close = { 0 };
-        button_close.text = strdup("X");
-        button_close.type = SWAYNAG_ACTION_DISMISS;
-        list_add(swaynag.buttons, &button_close);
+        struct swaynag_button *button_close = calloc(1, sizeof(struct swaynag_button));
+        button_close->text = strdup("X");
+        button_close->type = SWAYNAG_ACTION_DISMISS;
+        list_add(swaynag.buttons, button_close);
+
+        swaynag.details.details_text = strdup("Toggle details");
 
         char *config_path = NULL;
         bool debug = false;
@@ -54,8 +55,6 @@ int main(int argc, char **argv) {
                 }
         }
 
-        swaynag.details.button_details.text = strdup("Toggle details");
-        swaynag.details.button_details.type = SWAYNAG_ACTION_EXPAND;
 
         if (argc > 1) {
                 struct swaynag_type *type_args = swaynag_type_new("<args>");
@@ -88,17 +87,20 @@ int main(int argc, char **argv) {
         swaynag_type_merge(type, swaynag_type_get(types, "<args>"));
         swaynag.type = type;
 
-        swaynag_types_free(types);
-
         if (swaynag.details.message) {
-                list_add(swaynag.buttons, &swaynag.details.button_details);
+                swaynag.details.button_details = calloc(1, sizeof(struct swaynag_button));
+                swaynag.details.button_details->text = strdup(swaynag.details.details_text);
+                swaynag.details.button_details->type = SWAYNAG_ACTION_EXPAND;
+                list_add(swaynag.buttons, swaynag.details.button_details);
         }
 
         sway_log(SWAY_DEBUG, "Output: %s", swaynag.type->output);
         sway_log(SWAY_DEBUG, "Anchors: %" PRIu32, swaynag.type->anchors);
         sway_log(SWAY_DEBUG, "Type: %s", swaynag.type->name);
         sway_log(SWAY_DEBUG, "Message: %s", swaynag.message);
-        sway_log(SWAY_DEBUG, "Font: %s", swaynag.type->font);
+        char *font = pango_font_description_to_string(swaynag.type->font_description);
+        sway_log(SWAY_DEBUG, "Font: %s", font);
+        free(font);
         sway_log(SWAY_DEBUG, "Buttons");
         for (int i = 0; i < swaynag.buttons->length; i++) {
                 struct swaynag_button *button = swaynag.buttons->items[i];
@@ -109,11 +111,9 @@ int main(int argc, char **argv) {
 
         swaynag_setup(&swaynag);
         swaynag_run(&swaynag);
-        return status;
 
 cleanup:
         swaynag_types_free(types);
-        free(swaynag.details.button_details.text);
         swaynag_destroy(&swaynag);
         return status;
 }