1 files changed, 18 insertions, 30 deletions

diff --git a/swaynag/main.c b/swaynag/main.c
index 88007818..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"
@@ -20,33 +19,27 @@ void sway_terminate(int code) {
 }
 
 int main(int argc, char **argv) {
-        int exit_code = EXIT_SUCCESS;
+        int status = EXIT_SUCCESS;
 
         list_t *types = create_list();
         swaynag_types_add_default(types);
 
-        memset(&swaynag, 0, sizeof(swaynag));
         swaynag.buttons = create_list();
         wl_list_init(&swaynag.outputs);
         wl_list_init(&swaynag.seats);
 
-        struct swaynag_button *button_close =
-                calloc(sizeof(struct swaynag_button), 1);
+        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.button_details =
-                calloc(sizeof(struct swaynag_button), 1);
-        swaynag.details.button_details->text = strdup("Toggle details");
-        swaynag.details.button_details->type = SWAYNAG_ACTION_EXPAND;
+        swaynag.details.details_text = strdup("Toggle details");
 
         char *config_path = NULL;
         bool debug = false;
-        int launch_status = swaynag_parse_options(argc, argv, NULL, NULL, NULL,
+        status = swaynag_parse_options(argc, argv, NULL, NULL, NULL,
                         &config_path, &debug);
-        if (launch_status != 0)  {
-                exit_code = launch_status;
+        if (status != 0)  {
                 goto cleanup;
         }
         sway_log_init(debug ? SWAY_DEBUG : SWAY_ERROR, NULL);
@@ -56,29 +49,27 @@ int main(int argc, char **argv) {
         }
         if (config_path) {
                 sway_log(SWAY_DEBUG, "Loading config file: %s", config_path);
-                int config_status = swaynag_load_config(config_path, &swaynag, types);
-                free(config_path);
-                if (config_status != 0) {
-                        exit_code = config_status;
+                status = swaynag_load_config(config_path, &swaynag, types);
+                if (status != 0) {
                         goto cleanup;
                 }
         }
 
+
         if (argc > 1) {
                 struct swaynag_type *type_args = swaynag_type_new("<args>");
                 list_add(types, type_args);
 
-                int result = swaynag_parse_options(argc, argv, &swaynag, types,
+                status = swaynag_parse_options(argc, argv, &swaynag, types,
                                 type_args, NULL, NULL);
-                if (result != 0) {
-                        exit_code = result;
+                if (status != 0) {
                         goto cleanup;
                 }
         }
 
         if (!swaynag.message) {
                 sway_log(SWAY_ERROR, "No message passed. Please provide --message/-m");
-                exit_code = EXIT_FAILURE;
+                status = EXIT_FAILURE;
                 goto cleanup;
         }
 
@@ -96,20 +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) {
+                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);
-        } else {
-                free(swaynag.details.button_details->text);
-                free(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];
@@ -120,12 +111,9 @@ int main(int argc, char **argv) {
 
         swaynag_setup(&swaynag);
         swaynag_run(&swaynag);
-        return exit_code;
 
 cleanup:
         swaynag_types_free(types);
-        free(swaynag.details.button_details->text);
-        free(swaynag.details.button_details);
         swaynag_destroy(&swaynag);
-        return exit_code;
+        return status;
 }