From 0c73bf5735c943ebaf314fc9676e4262220f7bb5 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Mon, 26 May 2014 11:47:44 +0200 Subject: [PATCH] mir: create devices from _constructed The "display" property is not yet set at time of _init. --- gdk/mir/gdkmirdevicemanager.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gdk/mir/gdkmirdevicemanager.c b/gdk/mir/gdkmirdevicemanager.c index 7c8fa433dd..4140fe7fe9 100644 --- a/gdk/mir/gdkmirdevicemanager.c +++ b/gdk/mir/gdkmirdevicemanager.c @@ -89,15 +89,26 @@ _gdk_mir_device_manager_get_keyboard (GdkDeviceManager *device_manager) static void gdk_mir_device_manager_init (GdkMirDeviceManager *device_manager) { +} + +static void +gdk_mir_device_manager_constructed (GObject *object) +{ + GdkMirDeviceManager *device_manager = GDK_MIR_DEVICE_MANAGER (object); + device_manager->keyboard = _gdk_mir_device_new (GDK_DEVICE_MANAGER (device_manager), "Mir Keyboard", GDK_SOURCE_KEYBOARD, FALSE); device_manager->pointer = _gdk_mir_device_new (GDK_DEVICE_MANAGER (device_manager), "Mir Pointer", GDK_SOURCE_MOUSE, TRUE); + + G_OBJECT_CLASS (gdk_mir_device_manager_parent_class)->constructed (object); } static void gdk_mir_device_manager_class_init (GdkMirDeviceManagerClass *klass) { GdkDeviceManagerClass *device_manager_class = GDK_DEVICE_MANAGER_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); device_manager_class->list_devices = gdk_mir_device_manager_list_devices; device_manager_class->get_client_pointer = gdk_mir_device_manager_get_client_pointer; + object_class->constructed = gdk_mir_device_manager_constructed; }