aboutsummaryrefslogtreecommitdiffstats
path: root/sway/ipc-json.c
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-02-10 15:37:24 -0500
committerLibravatar emersion <contact@emersion.fr>2019-02-11 01:07:11 +0100
commita64a3ee6bbd3b880c32bbd9c9a38420d04748dd2 (patch)
treef76005c6ef9cd50c253c62a1aee992d0ecce6f04 /sway/ipc-json.c
parentview: remove pointer constraints on unmap (diff)
downloadsway-a64a3ee6bbd3b880c32bbd9c9a38420d04748dd2.tar.gz
sway-a64a3ee6bbd3b880c32bbd9c9a38420d04748dd2.tar.zst
sway-a64a3ee6bbd3b880c32bbd9c9a38420d04748dd2.zip
ipc: handle unnamed xkb_active_layout_name
If the active xkb_layout does not have a name, use `NULL` instead of `json_object_new_string(NULL)`. This also makes it so swaymsg will pretty print this as `(unnamed)`.
Diffstat (limited to 'sway/ipc-json.c')
-rw-r--r--sway/ipc-json.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index e1098942..23016dbd 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -597,7 +597,7 @@ json_object *ipc_json_describe_input(struct sway_input_device *device) {
597 const char *layout = 597 const char *layout =
598 xkb_keymap_layout_get_name(keymap, layout_idx); 598 xkb_keymap_layout_get_name(keymap, layout_idx);
599 json_object_object_add(object, "xkb_active_layout_name", 599 json_object_object_add(object, "xkb_active_layout_name",
600 json_object_new_string(layout)); 600 layout ? json_object_new_string(layout) : NULL);
601 break; 601 break;
602 } 602 }
603 } 603 }