[mutter/wip/carlosg/shuffle-font-mouse-settings: 246/246] backends: Update pointer drag-threshold/double-click settings location

[Jonas Ådahl <jadahl src gnome org>]

commit 65a4049f47db852096237076aaaa6e04c25f07ff
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Aug 27 00:08:00 2020 +0200

    backends: Update pointer drag-threshold/double-click settings location
    
    Following recent gsettings-desktop-schemas changes.
    
    https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1416

 src/backends/meta-input-settings.c | 12 ++++--------
 src/core/prefs.c                   |  3 +--
 2 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/src/backends/meta-input-settings.c b/src/backends/meta-input-settings.c
index 0efaeb6557..cba36407c8 100644
--- a/src/backends/meta-input-settings.c
+++ b/src/backends/meta-input-settings.c
@@ -73,7 +73,6 @@ struct _MetaInputSettingsPrivate
   GSettings *touchpad_settings;
   GSettings *trackball_settings;
   GSettings *keyboard_settings;
-  GSettings *gsd_settings;
   GSettings *keyboard_a11y_settings;
   GSettings *mouse_a11y_settings;
 
@@ -161,7 +160,6 @@ meta_input_settings_dispose (GObject *object)
   g_clear_object (&priv->touchpad_settings);
   g_clear_object (&priv->trackball_settings);
   g_clear_object (&priv->keyboard_settings);
-  g_clear_object (&priv->gsd_settings);
   g_clear_object (&priv->keyboard_a11y_settings);
   g_clear_object (&priv->mouse_a11y_settings);
   g_clear_object (&priv->input_mapper);
@@ -2070,6 +2068,10 @@ meta_input_settings_init (MetaInputSettings *settings)
   g_signal_connect (priv->mouse_settings, "changed",
                     G_CALLBACK (meta_input_settings_changed_cb), settings);
 
+  g_settings_bind (priv->mouse_settings, "double-click",
+                   clutter_settings_get_default(), "double-click-time",
+                   G_SETTINGS_BIND_GET);
+
   priv->touchpad_settings = g_settings_new ("org.gnome.desktop.peripherals.touchpad");
   g_signal_connect (priv->touchpad_settings, "changed",
                     G_CALLBACK (meta_input_settings_changed_cb), settings);
@@ -2082,12 +2084,6 @@ meta_input_settings_init (MetaInputSettings *settings)
   g_signal_connect (priv->keyboard_settings, "changed",
                     G_CALLBACK (meta_input_settings_changed_cb), settings);
 
-  priv->gsd_settings = g_settings_new ("org.gnome.settings-daemon.peripherals.mouse");
-
-  g_settings_bind (priv->gsd_settings, "double-click",
-                   clutter_settings_get_default(), "double-click-time",
-                   G_SETTINGS_BIND_GET);
-
   priv->keyboard_a11y_settings = g_settings_new ("org.gnome.desktop.a11y.keyboard");
   g_signal_connect (priv->keyboard_a11y_settings, "changed",
                     G_CALLBACK (meta_input_keyboard_a11y_settings_changed), settings);
diff --git a/src/core/prefs.c b/src/core/prefs.c
index a12b66671f..60d7a278a8 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -68,8 +68,7 @@
 #define SCHEMA_MUTTER          "org.gnome.mutter"
 #define SCHEMA_INTERFACE       "org.gnome.desktop.interface"
 #define SCHEMA_INPUT_SOURCES   "org.gnome.desktop.input-sources"
-#define SCHEMA_XSETTINGS       "org.gnome.settings-daemon.plugins.xsettings"
-#define SCHEMA_MOUSE           "org.gnome.settings-daemon.peripherals.mouse"
+#define SCHEMA_MOUSE           "org.gnome.desktop.peripherals.mouse"
 
 #define SETTINGS(s) g_hash_table_lookup (settings_schemas, (s))