aboutsummaryrefslogtreecommitdiff
path: root/sway
diff options
context:
space:
mode:
authorBrian Ashworth <bosrsf04@gmail.com>2019-02-10 15:37:24 -0500
committeremersion <contact@emersion.fr>2019-02-11 01:07:11 +0100
commita64a3ee6bbd3b880c32bbd9c9a38420d04748dd2 (patch)
treef76005c6ef9cd50c253c62a1aee992d0ecce6f04 /sway
parent418c19fe528190918d41aefed46abe02c8b6834f (diff)
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')
-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) {
const char *layout =
xkb_keymap_layout_get_name(keymap, layout_idx);
json_object_object_add(object, "xkb_active_layout_name",
- json_object_new_string(layout));
+ layout ? json_object_new_string(layout) : NULL);
break;
}
}