Merge branch 'wl-key-repeat' into 'master'

wayland: Rely on server key repeat info

See merge request GNOME/gtk!1150

1 files changed, 3 insertions, 36 deletions

diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
index 1b66f37b3a..3e3d4748b2 100644
--- a/gdk/wayland/gdkdevice-wayland.c
+++ b/gdk/wayland/gdkdevice-wayland.c
@@ -241,7 +241,6 @@ struct _GdkWaylandSeat
   guint32 repeat_key;
   guint32 repeat_count;
   gint64 repeat_deadline;
-  GSettings *keyboard_settings;
   uint32_t keyboard_time;
   uint32_t keyboard_key_serial;
 
@@ -2013,26 +2012,6 @@ keyboard_handle_leave (void               *data,
 
 static gboolean keyboard_repeat (gpointer data);
 
-static GSettings *
-get_keyboard_settings (GdkWaylandSeat *seat)
-{
-  if (!seat->keyboard_settings)
-    {
-      GSettingsSchemaSource *source;
-      GSettingsSchema *schema;
-
-      source = g_settings_schema_source_get_default ();
-      schema = g_settings_schema_source_lookup (source, "org.gnome.settings-daemon.peripherals.keyboard", FALSE);
-      if (schema != NULL)
-        {
-          seat->keyboard_settings = g_settings_new_full (schema, NULL, NULL);
-          g_settings_schema_unref (schema);
-        }
-    }
-
-  return seat->keyboard_settings;
-}
-
 static gboolean
 get_key_repeat (GdkWaylandSeat *seat,
                 guint          *delay,
@@ -2055,20 +2034,9 @@ get_key_repeat (GdkWaylandSeat *seat,
     }
   else
     {
-      GSettings *keyboard_settings = get_keyboard_settings (seat);
-
-      if (keyboard_settings)
-        {
-          repeat = g_settings_get_boolean (keyboard_settings, "repeat");
-          *delay = g_settings_get_uint (keyboard_settings, "delay");
-          *interval = g_settings_get_uint (keyboard_settings, "repeat-interval");
-        }
-      else
-        {
-          repeat = TRUE;
-          *delay = 400;
-          *interval = 80;
-        }
+      repeat = TRUE;
+      *delay = 400;
+      *interval = 80;
     }
 
   return repeat;
@@ -4567,7 +4535,6 @@ gdk_wayland_seat_finalize (GObject *object)
   g_object_unref (seat->keymap);
   gdk_wayland_pointer_data_finalize (&seat->pointer_info);
   /* FIXME: destroy data_device */
-  g_clear_object (&seat->keyboard_settings);
   g_clear_object (&seat->drag);
   g_clear_object (&seat->drop);
   g_clear_object (&seat->clipboard);