[gnome-settings-daemon] keyboard: Merge gsd_keyboard_xkb_analyze_sysconfig()

[Bastien Nocera <hadess src gnome org>]

commit 838dbc80eee25475c0d8f61627846a7a38491084
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Apr 26 19:30:57 2012 +0100

    keyboard: Merge gsd_keyboard_xkb_analyze_sysconfig()

 plugins/keyboard/gsd-keyboard-manager.c |   15 +++------------
 1 files changed, 3 insertions(+), 12 deletions(-)
---
diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
index ba40cfa..544333e 100644
--- a/plugins/keyboard/gsd-keyboard-manager.c
+++ b/plugins/keyboard/gsd-keyboard-manager.c
@@ -434,17 +434,6 @@ filter_xkb_config (GsdKeyboardManager *manager)
 }
 
 static void
-gsd_keyboard_xkb_analyze_sysconfig (GsdKeyboardManager *manager)
-{
-	if (manager->priv->xkl_engine == NULL)
-		return;
-
-	gkbd_keyboard_config_init (&manager->priv->initial_sys_kbd_config, manager->priv->xkl_engine);
-	gkbd_keyboard_config_load_from_x_initial (&manager->priv->initial_sys_kbd_config,
-						  NULL);
-}
-
-static void
 gsd_keyboard_xkb_init (GsdKeyboardManager *manager)
 {
 	Display *dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
@@ -457,7 +446,9 @@ gsd_keyboard_xkb_init (GsdKeyboardManager *manager)
 	gkbd_keyboard_config_init (&manager->priv->current_kbd_config,
 				   manager->priv->xkl_engine);
 	xkl_engine_backup_names_prop (manager->priv->xkl_engine);
-	gsd_keyboard_xkb_analyze_sysconfig (manager);
+	gkbd_keyboard_config_init (&manager->priv->initial_sys_kbd_config, manager->priv->xkl_engine);
+	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);