[mutter/gbsneto/init-keymap] evdev: Initialize keymap before device manager
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/gbsneto/init-keymap] evdev: Initialize keymap before device manager
- Date: Wed, 30 Jan 2019 10:38:11 +0000 (UTC)
commit f8e1395913caad052158a48d703deb8da8b410f7
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Wed Jan 30 08:35:02 2019 -0200
evdev: Initialize keymap before device manager
The initialization routines of ClutterDeviceManagerEvdev assume
that backend->keymap is already initialized. However, the current
code initializes backend->keymap after ClutterDeviceManagerEvdev,
making it crash on startup.
Fix that by initializing backend->keymap before the device manager.
https://gitlab.gnome.org/GNOME/mutter/issues/451
clutter/clutter/evdev/clutter-device-manager-evdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/clutter/clutter/evdev/clutter-device-manager-evdev.c
b/clutter/clutter/evdev/clutter-device-manager-evdev.c
index dc14bfc20..84b0aad49 100644
--- a/clutter/clutter/evdev/clutter-device-manager-evdev.c
+++ b/clutter/clutter/evdev/clutter-device-manager-evdev.c
@@ -2136,10 +2136,10 @@ _clutter_events_evdev_init (ClutterBackend *backend)
{
CLUTTER_NOTE (EVENT, "Initializing evdev backend");
+ backend->keymap = g_object_new (CLUTTER_TYPE_KEYMAP_EVDEV, NULL);
backend->device_manager = g_object_new (CLUTTER_TYPE_DEVICE_MANAGER_EVDEV,
"backend", backend,
NULL);
- backend->keymap = g_object_new (CLUTTER_TYPE_KEYMAP_EVDEV, NULL);
}
void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]