diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2014-05-26 11:47:44 +0200 |
|---|---|---|
| committer | Robert Ancell <robert.ancell@canonical.com> | 2014-06-17 13:44:46 +1200 |
| commit | 4e829c244ee9c23143d127fe0eff00c9fed89598 (patch) | |
| tree | 40a576e25c17582eafba286b77129894a3c93c05 /gdk | |
| parent | 99310900bffd9f85a377acb609a3316735ae392a (diff) | |
| download | gtk+-4e829c244ee9c23143d127fe0eff00c9fed89598.tar.gz | |
mir: create devices from _constructed
The "display" property is not yet set at time of _init.
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/mir/gdkmirdevicemanager.c | 11 |
1 files changed, 11 insertions, 0 deletions
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; } |