aboutsummaryrefslogtreecommitdiff
path: root/swaybar/ipc.c
diff options
context:
space:
mode:
authorIan Fan <ianfan0@gmail.com>2018-10-12 20:23:01 +0100
committerIan Fan <ianfan0@gmail.com>2018-10-14 13:33:12 +0100
commitfed11d1c7b388e999414dd8cec4b8982ba5ce950 (patch)
tree06ab708d92e6727006aa8912a26a5b3851cc6cd4 /swaybar/ipc.c
parenta388ffa12776cfad11c13f0bc0b60a5face38a9b (diff)
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.c11
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) {
json_object *json_change, *json_pango_markup;
if (json_object_object_get_ex(result, "change", &json_change)) {
const char *change = json_object_get_string(json_change);
- free(bar->config->mode);
- if (strcmp(change, "default") == 0) {
- bar->config->mode = NULL;
- } else {
- bar->config->mode = strdup(change);
- }
+ free(bar->mode);
+ bar->mode = strcmp(change, "default") != 0 ? strdup(change) : NULL;
} else {
wlr_log(WLR_ERROR, "failed to parse response");
json_object_put(result);
@@ -400,8 +396,7 @@ bool handle_ipc_readable(struct swaybar *bar) {
}
if (json_object_object_get_ex(result,
"pango_markup", &json_pango_markup)) {
- bar->config->mode_pango_markup = json_object_get_boolean(
- json_pango_markup);
+ bar->mode_pango_markup = json_object_get_boolean(json_pango_markup);
}
json_object_put(result);
break;