[gnome-settings-daemon] keyboard: Move GSettings to main _start() function

[Bastien Nocera <hadess src gnome org>]

commit 282239328143c4bbdcadd2b7b511ef3b4c3ffdf2
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Apr 26 19:35:27 2012 +0100

    keyboard: Move GSettings to main _start() function

 plugins/keyboard/gsd-keyboard-manager.c |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
index 544333e..eab6af1 100644
--- a/plugins/keyboard/gsd-keyboard-manager.c
+++ b/plugins/keyboard/gsd-keyboard-manager.c
@@ -450,14 +450,6 @@ gsd_keyboard_xkb_init (GsdKeyboardManager *manager)
 	gkbd_keyboard_config_load_from_x_initial (&manager->priv->initial_sys_kbd_config,
 						  NULL);
 
-	manager->priv->settings_desktop = g_settings_new (GKBD_DESKTOP_SCHEMA);
-	manager->priv->settings_keyboard = g_settings_new (GKBD_KEYBOARD_SCHEMA);
-	g_signal_connect (manager->priv->settings_desktop, "changed",
-			  (GCallback) desktop_settings_changed,
-			  manager);
-	g_signal_connect (manager->priv->settings_keyboard, "changed",
-			  (GCallback) xkb_settings_changed, manager);
-
 	gnome_settings_profile_start ("xkl_engine_start_listen");
 	xkl_engine_start_listen (manager->priv->xkl_engine,
 				 XKLL_MANAGE_LAYOUTS |
@@ -708,8 +700,9 @@ start_keyboard_idle_cb (GsdKeyboardManager *manager)
 
         g_debug ("Starting keyboard manager");
 
-	check_xkb_extension (manager);
         manager->priv->settings = g_settings_new (GSD_KEYBOARD_DIR);
+	manager->priv->settings_desktop = g_settings_new (GKBD_DESKTOP_SCHEMA);
+	manager->priv->settings_keyboard = g_settings_new (GKBD_KEYBOARD_SCHEMA);
 
 	if (manager->priv->have_xkb) {
 		gsd_keyboard_xkb_init (manager);
@@ -723,6 +716,10 @@ start_keyboard_idle_cb (GsdKeyboardManager *manager)
 
         g_signal_connect (G_OBJECT (manager->priv->settings), "changed",
                           G_CALLBACK (apply_settings), manager);
+	g_signal_connect (manager->priv->settings_desktop, "changed",
+			  (GCallback) desktop_settings_changed, manager);
+	g_signal_connect (manager->priv->settings_keyboard, "changed",
+			  (GCallback) xkb_settings_changed, manager);
 
 	if (manager->priv->have_xkb)
 		install_xkb_filter (manager);