diff -up gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-xkb.c.xkb-init gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-xkb.c
--- gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-xkb.c.xkb-init 2009-04-29 21:42:13.873737299 -0400
+++ gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-xkb.c 2009-04-29 21:42:23.752987998 -0400
@@ -234,7 +234,7 @@ gsd_keyboard_xkb_analyze_sysconfig (void
conf_client = gconf_client_get_default ();
gkbd_keyboard_config_init (&initial_sys_kbd_config,
conf_client, xkl_engine);
- gkbd_keyboard_config_load_from_x_initial (&initial_sys_kbd_config,
+ gkbd_keyboard_config_load_from_x_current (&initial_sys_kbd_config,
NULL);
g_object_unref (conf_client);
}