diff options
Diffstat (limited to 'swaynag')
-rw-r--r-- | swaynag/config.c | 4 | ||||
-rw-r--r-- | swaynag/main.c | 20 |
2 files changed, 7 insertions, 17 deletions
diff --git a/swaynag/config.c b/swaynag/config.c index 73fc41c8..b212a0c3 100644 --- a/swaynag/config.c +++ b/swaynag/config.c | |||
@@ -232,8 +232,8 @@ int swaynag_parse_options(int argc, char **argv, struct swaynag *swaynag, | |||
232 | break; | 232 | break; |
233 | case 'L': // Detailed Button Text | 233 | case 'L': // Detailed Button Text |
234 | if (swaynag) { | 234 | if (swaynag) { |
235 | free(swaynag->details.button_details->text); | 235 | free(swaynag->details.button_details.text); |
236 | swaynag->details.button_details->text = strdup(optarg); | 236 | swaynag->details.button_details.text = strdup(optarg); |
237 | } | 237 | } |
238 | break; | 238 | break; |
239 | case 'm': // Message | 239 | case 'm': // Message |
diff --git a/swaynag/main.c b/swaynag/main.c index 0c94cb1a..112a8b2f 100644 --- a/swaynag/main.c +++ b/swaynag/main.c | |||
@@ -40,15 +40,6 @@ int main(int argc, char **argv) { | |||
40 | button_close->type = SWAYNAG_ACTION_DISMISS; | 40 | button_close->type = SWAYNAG_ACTION_DISMISS; |
41 | list_add(swaynag.buttons, button_close); | 41 | list_add(swaynag.buttons, button_close); |
42 | 42 | ||
43 | swaynag.details.button_details = | ||
44 | calloc(sizeof(struct swaynag_button), 1); | ||
45 | if (!swaynag.details.button_details) { | ||
46 | perror("calloc"); | ||
47 | return EXIT_FAILURE; | ||
48 | } | ||
49 | swaynag.details.button_details->text = strdup("Toggle details"); | ||
50 | swaynag.details.button_details->type = SWAYNAG_ACTION_EXPAND; | ||
51 | |||
52 | char *config_path = NULL; | 43 | char *config_path = NULL; |
53 | bool debug = false; | 44 | bool debug = false; |
54 | int launch_status = swaynag_parse_options(argc, argv, NULL, NULL, NULL, | 45 | int launch_status = swaynag_parse_options(argc, argv, NULL, NULL, NULL, |
@@ -72,6 +63,9 @@ int main(int argc, char **argv) { | |||
72 | } | 63 | } |
73 | } | 64 | } |
74 | 65 | ||
66 | swaynag.details.button_details.text = strdup("Toggle details"); | ||
67 | swaynag.details.button_details.type = SWAYNAG_ACTION_EXPAND; | ||
68 | |||
75 | if (argc > 1) { | 69 | if (argc > 1) { |
76 | struct swaynag_type *type_args = swaynag_type_new("<args>"); | 70 | struct swaynag_type *type_args = swaynag_type_new("<args>"); |
77 | list_add(types, type_args); | 71 | list_add(types, type_args); |
@@ -107,10 +101,7 @@ int main(int argc, char **argv) { | |||
107 | swaynag_types_free(types); | 101 | swaynag_types_free(types); |
108 | 102 | ||
109 | if (swaynag.details.message) { | 103 | if (swaynag.details.message) { |
110 | list_add(swaynag.buttons, swaynag.details.button_details); | 104 | list_add(swaynag.buttons, &swaynag.details.button_details); |
111 | } else { | ||
112 | free(swaynag.details.button_details->text); | ||
113 | free(swaynag.details.button_details); | ||
114 | } | 105 | } |
115 | 106 | ||
116 | sway_log(SWAY_DEBUG, "Output: %s", swaynag.type->output); | 107 | sway_log(SWAY_DEBUG, "Output: %s", swaynag.type->output); |
@@ -132,8 +123,7 @@ int main(int argc, char **argv) { | |||
132 | 123 | ||
133 | cleanup: | 124 | cleanup: |
134 | swaynag_types_free(types); | 125 | swaynag_types_free(types); |
135 | free(swaynag.details.button_details->text); | 126 | free(swaynag.details.button_details.text); |
136 | free(swaynag.details.button_details); | ||
137 | swaynag_destroy(&swaynag); | 127 | swaynag_destroy(&swaynag); |
138 | return exit_code; | 128 | return exit_code; |
139 | } | 129 | } |