diff options
author | Nihal Jere <nihal@nihaljere.xyz> | 2022-02-28 17:18:54 -0600 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2022-03-15 11:40:32 +0100 |
commit | 4780afb68b4ee2cdf0e4925f40cf885819f8a74a (patch) | |
tree | 46ebdb918f86d163259520d67d6f7928b8634d40 | |
parent | swaynag: allocate button_details with details (diff) | |
download | sway-4780afb68b4ee2cdf0e4925f40cf885819f8a74a.tar.gz sway-4780afb68b4ee2cdf0e4925f40cf885819f8a74a.tar.zst sway-4780afb68b4ee2cdf0e4925f40cf885819f8a74a.zip |
swaynag: statically allocate button_close, and move declaration
Every swaynag has a close button, so it doesn't make sense to
allocate it dynamically. The declaration is moved later to when
it is actually needed.
-rw-r--r-- | swaynag/main.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/swaynag/main.c b/swaynag/main.c index 112a8b2f..f7bf8a20 100644 --- a/swaynag/main.c +++ b/swaynag/main.c | |||
@@ -30,16 +30,6 @@ int main(int argc, char **argv) { | |||
30 | wl_list_init(&swaynag.outputs); | 30 | wl_list_init(&swaynag.outputs); |
31 | wl_list_init(&swaynag.seats); | 31 | wl_list_init(&swaynag.seats); |
32 | 32 | ||
33 | struct swaynag_button *button_close = | ||
34 | calloc(sizeof(struct swaynag_button), 1); | ||
35 | if (!button_close) { | ||
36 | perror("calloc"); | ||
37 | return EXIT_FAILURE; | ||
38 | } | ||
39 | button_close->text = strdup("X"); | ||
40 | button_close->type = SWAYNAG_ACTION_DISMISS; | ||
41 | list_add(swaynag.buttons, button_close); | ||
42 | |||
43 | char *config_path = NULL; | 33 | char *config_path = NULL; |
44 | bool debug = false; | 34 | bool debug = false; |
45 | int launch_status = swaynag_parse_options(argc, argv, NULL, NULL, NULL, | 35 | int launch_status = swaynag_parse_options(argc, argv, NULL, NULL, NULL, |
@@ -100,6 +90,11 @@ int main(int argc, char **argv) { | |||
100 | 90 | ||
101 | swaynag_types_free(types); | 91 | swaynag_types_free(types); |
102 | 92 | ||
93 | struct swaynag_button button_close = { 0 }; | ||
94 | button_close.text = strdup("X"); | ||
95 | button_close.type = SWAYNAG_ACTION_DISMISS; | ||
96 | list_add(swaynag.buttons, &button_close); | ||
97 | |||
103 | if (swaynag.details.message) { | 98 | if (swaynag.details.message) { |
104 | list_add(swaynag.buttons, &swaynag.details.button_details); | 99 | list_add(swaynag.buttons, &swaynag.details.button_details); |
105 | } | 100 | } |