[gnome-settings-daemon] mouse: Migrate settings when the plugin is activated
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] mouse: Migrate settings when the plugin is activated
- Date: Mon, 4 Jan 2016 14:14:29 +0000 (UTC)
commit 778fa04581f6552b0d878a8941b2c2d68e79a2eb
Author: Bastien Nocera <hadess hadess net>
Date: Thu Dec 17 14:42:50 2015 +0100
mouse: Migrate settings when the plugin is activated
Instead of on startup, as that generates I/O.
plugins/mouse/gsd-mouse-manager.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
index f2f90ba..da7b378 100644
--- a/plugins/mouse/gsd-mouse-manager.c
+++ b/plugins/mouse/gsd-mouse-manager.c
@@ -114,6 +114,7 @@ G_DEFINE_TYPE (GsdMouseManager, gsd_mouse_manager, G_TYPE_OBJECT)
static gpointer manager_object = NULL;
+static void migrate_mouse_settings (void);
static void
gsd_mouse_manager_class_init (GsdMouseManagerClass *klass)
@@ -1433,6 +1434,8 @@ gsd_mouse_manager_start (GsdMouseManager *manager,
{
gnome_settings_profile_start (NULL);
+ migrate_mouse_settings ();
+
if (!supports_xinput_devices ()) {
g_debug ("XInput is not supported, not applying any settings");
return TRUE;
@@ -1582,7 +1585,6 @@ gsd_mouse_manager_new (void)
if (manager_object != NULL) {
g_object_ref (manager_object);
} else {
- migrate_mouse_settings ();
manager_object = g_object_new (GSD_TYPE_MOUSE_MANAGER, NULL);
g_object_add_weak_pointer (manager_object,
(gpointer *) &manager_object);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]