[gnome-settings-daemon] mouse: Use A11Y settings from gsettings-desktop-schemas

[Rodrigo Moya <rodrigo src gnome org>]

commit 0be76055a2177e03bc5c59c572dc0025d2d494ba
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Thu Oct 21 22:27:34 2010 +0200

    mouse: Use A11Y settings from gsettings-desktop-schemas

 data/gnome-settings-daemon.convert                 |    2 --
 ...e.settings-daemon.peripherals.gschema.xml.in.in |    8 --------
 plugins/mouse/gsd-mouse-manager.c                  |   16 ++++++++++++----
 3 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/data/gnome-settings-daemon.convert b/data/gnome-settings-daemon.convert
index 982e55e..69ea3de 100644
--- a/data/gnome-settings-daemon.convert
+++ b/data/gnome-settings-daemon.convert
@@ -77,8 +77,6 @@ priority = /apps/gnome_settings_daemon/plugins/mouse/priority
 locate-pointer = /desktop/gnome/peripherals/mouse/locate_pointer
 double-click = /desktop/gnome/peripherals/mouse/double_click
 drag-threshold = /desktop/gnome/peripherals/mouse/drag_threshold
-dwell-click-enabled = /desktop/gnome/accessibility/mouse/dwell_enable
-secondary-click-enabled = /desktop/gnome/accessibility/mouse/delay_enable
 left-handed = /desktop/gnome/peripherals/mouse/left_handed
 motion-acceleration = /desktop/gnome/peripherals/mouse/motion_acceleration
 motion-threshold = /desktop/gnome/peripherals/mouse/motion_threshold
diff --git a/data/org.gnome.settings-daemon.peripherals.gschema.xml.in.in b/data/org.gnome.settings-daemon.peripherals.gschema.xml.in.in
index d849bd9..782f586 100644
--- a/data/org.gnome.settings-daemon.peripherals.gschema.xml.in.in
+++ b/data/org.gnome.settings-daemon.peripherals.gschema.xml.in.in
@@ -92,14 +92,6 @@
     </key>
   </schema>
   <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.gnome.settings-daemon.peripherals.mouse" path="/apps/gnome-settings-daemon/peripherals/mouse/">
-    <key name="dwell-click-enabled" type="b">
-      <default>false</default>
-      <_summary>Enable dwell clicks</_summary>
-    </key>
-    <key name="secondary-click-enabled" type="b">
-      <default>false</default>
-      <_summary>Enable simulated secondary clicks</_summary>
-    </key>
     <key name="locate-pointer" type="b">
       <default>false</default>
       <_summary>Highlights the current location of the pointer when the Control key is pressed and released.</_summary>
diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index 58605a5..79b1c80 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -74,6 +74,7 @@ struct GsdMouseManagerPrivate
 {
         GSettings *touchpad_settings;
         GSettings *mouse_settings;
+	GSettings *mouse_a11y_settings;
         GdkDeviceManager *device_manager;
         guint notify;
 
@@ -849,10 +850,10 @@ set_mousetweaks_daemon (GsdMouseManager *manager,
                         GtkWidget *dialog;
 
                         if (dwell_click_enabled) {
-                                g_settings_set_boolean (manager->priv->mouse_settings,
+                                g_settings_set_boolean (manager->priv->mouse_a11y_settings,
                                                         KEY_DWELL_CLICK_ENABLED, FALSE);
                         } else if (secondary_click_enabled) {
-                                g_settings_set_boolean (manager->priv->mouse_settings,
+                                g_settings_set_boolean (manager->priv->mouse_a11y_settings,
                                                         KEY_SECONDARY_CLICK_ENABLED, FALSE);
                         }
 
@@ -967,6 +968,10 @@ gsd_mouse_manager_idle_cb (GsdMouseManager *manager)
         g_signal_connect (manager->priv->mouse_settings, "changed",
                           G_CALLBACK (mouse_callback), manager);
 
+        manager->priv->mouse_a11y_settings = g_settings_new ("org.gnome.desktop.a11y.mouse");
+        g_signal_connect (manager->priv->mouse_a11y_settings, "changed",
+                          G_CALLBACK (mouse_callback), manager);
+
         manager->priv->touchpad_settings = g_settings_new (SETTINGS_TOUCHPAD_DIR);
         g_signal_connect (manager->priv->touchpad_settings, "changed",
                           G_CALLBACK (touchpad_callback), manager);
@@ -977,8 +982,8 @@ gsd_mouse_manager_idle_cb (GsdMouseManager *manager)
         set_mouse_settings (manager);
         set_locate_pointer (manager, g_settings_get_boolean (manager->priv->mouse_settings, KEY_LOCATE_POINTER));
         set_mousetweaks_daemon (manager,
-                                g_settings_get_boolean (manager->priv->mouse_settings, KEY_DWELL_CLICK_ENABLED),
-                                g_settings_get_boolean (manager->priv->mouse_settings, KEY_SECONDARY_CLICK_ENABLED));
+                                g_settings_get_boolean (manager->priv->mouse_a11y_settings, KEY_DWELL_CLICK_ENABLED),
+                                g_settings_get_boolean (manager->priv->mouse_a11y_settings, KEY_SECONDARY_CLICK_ENABLED));
 
         set_disable_w_typing (manager, g_settings_get_boolean (manager->priv->touchpad_settings, KEY_TOUCHPAD_DISABLE_W_TYPING));
         set_tap_to_click (g_settings_get_boolean (manager->priv->touchpad_settings, KEY_TAP_TO_CLICK),
@@ -1041,6 +1046,9 @@ gsd_mouse_manager_finalize (GObject *object)
         if (mouse_manager->priv->mouse_settings != NULL)
                 g_object_unref (mouse_manager->priv->mouse_settings);
 
+        if (mouse_manager->priv->mouse_a11y_settings != NULL)
+                g_object_unref (mouse_manager->priv->mouse_a11y_settings);
+
         if (mouse_manager->priv->touchpad_settings != NULL)
                 g_object_unref (mouse_manager->priv->touchpad_settings);