diff options
| -rw-r--r-- | src/backends/native/meta-backend-native.c | 8 | ||||
| -rw-r--r-- | src/backends/native/meta-keymap-native.c | 2 | ||||
| -rw-r--r-- | src/backends/native/meta-seat-native.c | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c index 18709d5a5..73093cb03 100644 --- a/src/backends/native/meta-backend-native.c +++ b/src/backends/native/meta-backend-native.c @@ -284,6 +284,14 @@ meta_backend_native_set_keymap (MetaBackend *backend, keymap = xkb_keymap_new_from_names (context, &names, XKB_KEYMAP_COMPILE_NO_FLAGS); xkb_context_unref (context); + if (keymap == NULL) + { + g_warning ("Unable to load configured keymap: rules=%s, model=%s, layout=%s, variant=%s, options=%s", + DEFAULT_XKB_RULES_FILE, DEFAULT_XKB_MODEL, layouts, + variants, options); + return; + } + seat = clutter_backend_get_default_seat (clutter_backend); meta_seat_native_set_keyboard_map (META_SEAT_NATIVE (seat), keymap); diff --git a/src/backends/native/meta-keymap-native.c b/src/backends/native/meta-keymap-native.c index f55cd059f..3b0da0d1f 100644 --- a/src/backends/native/meta-keymap-native.c +++ b/src/backends/native/meta-keymap-native.c @@ -122,6 +122,8 @@ void meta_keymap_native_set_keyboard_map (MetaKeymapNative *keymap, struct xkb_keymap *xkb_keymap) { + g_return_if_fail (xkb_keymap != NULL); + if (keymap->keymap) xkb_keymap_unref (keymap->keymap); keymap->keymap = xkb_keymap_ref (xkb_keymap); diff --git a/src/backends/native/meta-seat-native.c b/src/backends/native/meta-seat-native.c index 3df16761a..e2f62b09b 100644 --- a/src/backends/native/meta-seat-native.c +++ b/src/backends/native/meta-seat-native.c @@ -3124,6 +3124,7 @@ meta_seat_native_set_keyboard_map (MetaSeatNative *seat, ClutterKeymap *keymap; g_return_if_fail (META_IS_SEAT_NATIVE (seat)); + g_return_if_fail (xkb_keymap != NULL); keymap = clutter_seat_get_keymap (CLUTTER_SEAT (seat)); meta_keymap_native_set_keyboard_map (META_KEYMAP_NATIVE (keymap), |