diff options
author | Ian Fan <ianfan0@gmail.com> | 2018-10-12 20:23:01 +0100 |
---|---|---|
committer | Ian Fan <ianfan0@gmail.com> | 2018-10-14 13:33:12 +0100 |
commit | fed11d1c7b388e999414dd8cec4b8982ba5ce950 (patch) | |
tree | 06ab708d92e6727006aa8912a26a5b3851cc6cd4 /swaybar/ipc.c | |
parent | swaybar: only send initial workspace request if workspace buttons are enabled (diff) | |
download | sway-fed11d1c7b388e999414dd8cec4b8982ba5ce950.tar.gz sway-fed11d1c7b388e999414dd8cec4b8982ba5ce950.tar.zst sway-fed11d1c7b388e999414dd8cec4b8982ba5ce950.zip |
swaybar: move mode & mode_pango_markup to bar struct
This distinguishes the binding mode from the distinct config mode, as
well as removing mode_pango_markup from the config struct where it
should not be present.
Diffstat (limited to 'swaybar/ipc.c')
-rw-r--r-- | swaybar/ipc.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/swaybar/ipc.c b/swaybar/ipc.c index 26b7eca6..8568f957 100644 --- a/swaybar/ipc.c +++ b/swaybar/ipc.c | |||
@@ -386,12 +386,8 @@ bool handle_ipc_readable(struct swaybar *bar) { | |||
386 | json_object *json_change, *json_pango_markup; | 386 | json_object *json_change, *json_pango_markup; |
387 | if (json_object_object_get_ex(result, "change", &json_change)) { | 387 | if (json_object_object_get_ex(result, "change", &json_change)) { |
388 | const char *change = json_object_get_string(json_change); | 388 | const char *change = json_object_get_string(json_change); |
389 | free(bar->config->mode); | 389 | free(bar->mode); |
390 | if (strcmp(change, "default") == 0) { | 390 | bar->mode = strcmp(change, "default") != 0 ? strdup(change) : NULL; |
391 | bar->config->mode = NULL; | ||
392 | } else { | ||
393 | bar->config->mode = strdup(change); | ||
394 | } | ||
395 | } else { | 391 | } else { |
396 | wlr_log(WLR_ERROR, "failed to parse response"); | 392 | wlr_log(WLR_ERROR, "failed to parse response"); |
397 | json_object_put(result); | 393 | json_object_put(result); |
@@ -400,8 +396,7 @@ bool handle_ipc_readable(struct swaybar *bar) { | |||
400 | } | 396 | } |
401 | if (json_object_object_get_ex(result, | 397 | if (json_object_object_get_ex(result, |
402 | "pango_markup", &json_pango_markup)) { | 398 | "pango_markup", &json_pango_markup)) { |
403 | bar->config->mode_pango_markup = json_object_get_boolean( | 399 | bar->mode_pango_markup = json_object_get_boolean(json_pango_markup); |
404 | json_pango_markup); | ||
405 | } | 400 | } |
406 | json_object_put(result); | 401 | json_object_put(result); |
407 | break; | 402 | break; |