mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-04-04 11:27:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

swaybar: move mode & mode_pango_markup to bar struct

Browse source 
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.
This commit is contained in:
Ian Fan 2018-10-12 20:23:01 +01:00
parent a388ffa127
commit fed11d1c7b
5 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
swaybar/ipc.c
View file

@ -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;