diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-06-14 18:53:40 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-14 18:53:40 -0400 |
commit | 298f56353ef155f6a2ccc977c96b2ff5d971e65e (patch) | |
tree | dcb3b74f1dde93bce8657b7509662ffd7db667d0 /sway/ipc-json.c | |
parent | Implement KDE's server-side decoration protocol (diff) | |
parent | Merge pull request #1234 from 4e554c4c/tray (diff) | |
download | sway-298f56353ef155f6a2ccc977c96b2ff5d971e65e.tar.gz sway-298f56353ef155f6a2ccc977c96b2ff5d971e65e.tar.zst sway-298f56353ef155f6a2ccc977c96b2ff5d971e65e.zip |
Merge branch 'master' into server-decoration
Diffstat (limited to 'sway/ipc-json.c')
-rw-r--r-- | sway/ipc-json.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 512144a4..31de53f0 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c | |||
@@ -327,7 +327,22 @@ json_object *ipc_json_describe_bar_config(struct bar_config *bar) { | |||
327 | 327 | ||
328 | json_object *json = json_object_new_object(); | 328 | json_object *json = json_object_new_object(); |
329 | json_object_object_add(json, "id", json_object_new_string(bar->id)); | 329 | json_object_object_add(json, "id", json_object_new_string(bar->id)); |
330 | json_object_object_add(json, "tray_output", NULL); | 330 | #ifdef ENABLE_TRAY |
331 | if (bar->tray_output) { | ||
332 | json_object_object_add(json, "tray_output", json_object_new_string(bar->tray_output)); | ||
333 | } else { | ||
334 | json_object_object_add(json, "tray_output", NULL); | ||
335 | } | ||
336 | if (bar->icon_theme) { | ||
337 | json_object_object_add(json, "icon_theme", json_object_new_string(bar->icon_theme)); | ||
338 | } else { | ||
339 | json_object_object_add(json, "icon_theme", NULL); | ||
340 | } | ||
341 | json_object_object_add(json, "tray_padding", json_object_new_int(bar->tray_padding)); | ||
342 | json_object_object_add(json, "activate_button", json_object_new_int(bar->activate_button)); | ||
343 | json_object_object_add(json, "context_button", json_object_new_int(bar->context_button)); | ||
344 | json_object_object_add(json, "secondary_button", json_object_new_int(bar->secondary_button)); | ||
345 | #endif | ||
331 | json_object_object_add(json, "mode", json_object_new_string(bar->mode)); | 346 | json_object_object_add(json, "mode", json_object_new_string(bar->mode)); |
332 | json_object_object_add(json, "hidden_state", json_object_new_string(bar->hidden_state)); | 347 | json_object_object_add(json, "hidden_state", json_object_new_string(bar->hidden_state)); |
333 | json_object_object_add(json, "modifier", json_object_new_string(get_modifier_name_by_mask(bar->modifier))); | 348 | json_object_object_add(json, "modifier", json_object_new_string(get_modifier_name_by_mask(bar->modifier))); |