[mutter] native: Remove previous listener for keyboard settings
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] native: Remove previous listener for keyboard settings
- Date: Sun, 18 Jan 2015 21:33:25 +0000 (UTC)
commit 049f67df0ac09ab95e5adc532c1caa413fb43416
Author: Carlos Garnacho <carlosg gnome org>
Date: Mon Dec 8 12:32:38 2014 +0100
native: Remove previous listener for keyboard settings
The settings-daemon peripherals schemas are going away, and this is
now handled through MetaInputSettings.
https://bugzilla.gnome.org/show_bug.cgi?id=739397
src/backends/native/meta-backend-native.c | 35 +----------------------------
1 files changed, 1 insertions(+), 34 deletions(-)
---
diff --git a/src/backends/native/meta-backend-native.c b/src/backends/native/meta-backend-native.c
index 0a1b588..22328f0 100644
--- a/src/backends/native/meta-backend-native.c
+++ b/src/backends/native/meta-backend-native.c
@@ -36,8 +36,6 @@
struct _MetaBackendNativePrivate
{
MetaLauncher *launcher;
-
- GSettings *keyboard_settings;
};
typedef struct _MetaBackendNativePrivate MetaBackendNativePrivate;
@@ -49,7 +47,7 @@ meta_backend_native_finalize (GObject *object)
MetaBackendNative *native = META_BACKEND_NATIVE (object);
MetaBackendNativePrivate *priv = meta_backend_native_get_instance_private (native);
- g_clear_object (&priv->keyboard_settings);
+ meta_launcher_free (priv->launcher);
G_OBJECT_CLASS (meta_backend_native_parent_class)->finalize (object);
}
@@ -156,45 +154,14 @@ pointer_constrain_callback (ClutterInputDevice *device,
}
static void
-set_keyboard_repeat (MetaBackendNative *native)
-{
- MetaBackendNativePrivate *priv = meta_backend_native_get_instance_private (native);
- ClutterDeviceManager *manager = clutter_device_manager_get_default ();
- gboolean repeat;
- unsigned int delay, interval;
-
- repeat = g_settings_get_boolean (priv->keyboard_settings, "repeat");
- delay = g_settings_get_uint (priv->keyboard_settings, "delay");
- interval = g_settings_get_uint (priv->keyboard_settings, "repeat-interval");
-
- clutter_evdev_set_keyboard_repeat (manager, repeat, delay, interval);
-}
-
-static void
-keyboard_settings_changed (GSettings *settings,
- const char *key,
- gpointer data)
-{
- MetaBackendNative *native = data;
- set_keyboard_repeat (native);
-}
-
-static void
meta_backend_native_post_init (MetaBackend *backend)
{
- MetaBackendNative *native = META_BACKEND_NATIVE (backend);
- MetaBackendNativePrivate *priv = meta_backend_native_get_instance_private (native);
ClutterDeviceManager *manager = clutter_device_manager_get_default ();
META_BACKEND_CLASS (meta_backend_native_parent_class)->post_init (backend);
clutter_evdev_set_pointer_constrain_callback (manager, pointer_constrain_callback,
NULL, NULL);
-
- priv->keyboard_settings = g_settings_new ("org.gnome.settings-daemon.peripherals.keyboard");
- g_signal_connect (priv->keyboard_settings, "changed",
- G_CALLBACK (keyboard_settings_changed), native);
- set_keyboard_repeat (native);
}
static MetaIdleMonitor *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]