[gnome-settings-daemon] mouse: Fix compilation

[Bastien Nocera <hadess src gnome org>]

commit 16b70ec43bd413143cd189dfc5668efa01ca7fcb
Author: Bastien Nocera <hadess hadess net>
Date:   Mon Mar 21 11:43:04 2011 +0000

    mouse: Fix compilation

 plugins/mouse/gsd-mouse-manager.c |   81 ++++++++++++++++++-------------------
 1 files changed, 40 insertions(+), 41 deletions(-)
---
diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index f56be82..ff9fb14 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -92,7 +92,6 @@ struct GsdMouseManagerPrivate
 static void     gsd_mouse_manager_class_init  (GsdMouseManagerClass *klass);
 static void     gsd_mouse_manager_init        (GsdMouseManager      *mouse_manager);
 static void     gsd_mouse_manager_finalize    (GObject             *object);
-static void     set_mouse_settings            (GsdMouseManager      *manager);
 static int      set_tap_to_click              (gboolean state, gboolean left_handed);
 
 G_DEFINE_TYPE (GsdMouseManager, gsd_mouse_manager, G_TYPE_OBJECT)
@@ -348,46 +347,6 @@ set_left_handed (GsdMouseManager *manager,
                 XFreeDeviceList (device_info);
 }
 
-static void
-device_added_cb (GdkDeviceManager *device_manager,
-                 GdkDevice        *device,
-                 gpointer          user_data)
-{
-        if (gdk_device_get_source (device) == GDK_SOURCE_MOUSE) {
-                set_mouse_settings ((GsdMouseManager *) user_data);
-
-                /* If a touchpad was to appear... */
-                set_disable_w_typing (manager, g_settings_get_boolean (manager->priv->touchpad_settings, key));
-        }
-}
-
-static void
-device_removed_cb (GdkDeviceManager *device_manager,
-		   GdkDevice        *device,
-		   gpointer          user_data)
-{
-        if (gdk_device_get_source (device) == GDK_SOURCE_MOUSE) {
-                /* If a touchpad was to disappear... */
-                set_disable_w_typing (manager, g_settings_get_boolean (manager->priv->touchpad_settings, key));
-        }
-}
-
-static void
-set_devicepresence_handler (GsdMouseManager *manager)
-{
-        GdkDeviceManager *device_manager;
-
-        device_manager = gdk_display_get_device_manager (gdk_display_get_default ());
-        if (device_manager == NULL)
-                return;
-
-        manager->priv->device_added_id = g_signal_connect (G_OBJECT (device_manager), "device-added",
-                                                           G_CALLBACK (device_added_cb), manager);
-        manager->priv->device_removed_id = g_signal_connect (G_OBJECT (device_manager), "device-removed",
-                                                             G_CALLBACK (device_removed_cb), manager);
-        manager->priv->device_manager = device_manager;
-}
-
 static XDevice *
 device_open (XDeviceInfo deviceinfo)
 {
@@ -972,6 +931,46 @@ touchpad_callback (GSettings       *settings,
 }
 
 static void
+device_added_cb (GdkDeviceManager *device_manager,
+                 GdkDevice        *device,
+                 GsdMouseManager  *manager)
+{
+        if (gdk_device_get_source (device) == GDK_SOURCE_MOUSE) {
+                set_mouse_settings (manager);
+
+                /* If a touchpad was to appear... */
+                set_disable_w_typing (manager, g_settings_get_boolean (manager->priv->touchpad_settings, KEY_TOUCHPAD_DISABLE_W_TYPING));
+        }
+}
+
+static void
+device_removed_cb (GdkDeviceManager *device_manager,
+		   GdkDevice        *device,
+		   GsdMouseManager  *manager)
+{
+        if (gdk_device_get_source (device) == GDK_SOURCE_MOUSE) {
+                /* If a touchpad was to disappear... */
+                set_disable_w_typing (manager, g_settings_get_boolean (manager->priv->touchpad_settings, KEY_TOUCHPAD_DISABLE_W_TYPING));
+        }
+}
+
+static void
+set_devicepresence_handler (GsdMouseManager *manager)
+{
+        GdkDeviceManager *device_manager;
+
+        device_manager = gdk_display_get_device_manager (gdk_display_get_default ());
+        if (device_manager == NULL)
+                return;
+
+        manager->priv->device_added_id = g_signal_connect (G_OBJECT (device_manager), "device-added",
+                                                           G_CALLBACK (device_added_cb), manager);
+        manager->priv->device_removed_id = g_signal_connect (G_OBJECT (device_manager), "device-removed",
+                                                             G_CALLBACK (device_removed_cb), manager);
+        manager->priv->device_manager = device_manager;
+}
+
+static void
 gsd_mouse_manager_init (GsdMouseManager *manager)
 {
         manager->priv = GSD_MOUSE_MANAGER_GET_PRIVATE (manager);