From fee40353e239412861c67158520b53ef0f91fac9 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 4 Sep 2014 12:15:50 -0700 Subject: [PATCH] meta-backend: Fix build --- src/backends/meta-backend.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/backends/meta-backend.c b/src/backends/meta-backend.c index 370e79ac1..efcca94ec 100644 --- a/src/backends/meta-backend.c +++ b/src/backends/meta-backend.c @@ -97,6 +97,13 @@ on_monitors_changed (MetaMonitorManager *monitors, meta_backend_sync_screen_size (backend); } +static MetaIdleMonitor * +meta_backend_create_idle_monitor (MetaBackend *backend, + int device_id) +{ + return META_BACKEND_GET_CLASS (backend)->create_idle_monitor (backend, device_id); +} + static void create_device_monitor (MetaBackend *backend, int device_id) @@ -124,7 +131,7 @@ on_device_added (ClutterDeviceManager *device_manager, MetaBackend *backend = META_BACKEND (user_data); int device_id = clutter_input_device_get_device_id (device); - create_idle_monitor (backend, device_id); + create_device_monitor (backend, device_id); } static void @@ -135,7 +142,7 @@ on_device_removed (ClutterDeviceManager *device_manager, MetaBackend *backend = META_BACKEND (user_data); int device_id = clutter_input_device_get_device_id (device); - destroy_idle_monitor (backend, device_id); + destroy_device_monitor (backend, device_id); } static void @@ -165,11 +172,11 @@ meta_backend_real_post_init (MetaBackend *backend) g_signal_connect_object (manager, "device-removed", G_CALLBACK (on_device_removed), backend, 0); - devices = clutter_device_manager_list_devices (backend); + devices = clutter_device_manager_list_devices (manager); for (l = devices; l != NULL; l = l->next) { - ClutterDevice *device = l->data; + ClutterInputDevice *device = l->data; on_device_added (manager, device, backend); } @@ -244,13 +251,6 @@ meta_backend_init (MetaBackend *backend) _backend = backend; } -static MetaIdleMonitor * -meta_backend_create_idle_monitor (MetaBackend *backend, - int device_id) -{ - return META_BACKEND_GET_CLASS (backend)->create_idle_monitor (backend, device_id); -} - static void meta_backend_post_init (MetaBackend *backend) {