gnome-settings-daemon r812 - in trunk: . plugins/keyboard

[jensg svn gnome org]

Author: jensg
Date: Sat Apr 11 16:19:47 2009
New Revision: 812
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=812&view=rev

Log:
2009-04-11  Jens Granseuer  <jensgr gmx net>

	* plugins/keyboard/gsd-keyboard-manager.c:
	(start_keyboard_idle_cb): preload GConf keyboard directory recursively
	to avoid roundtrips (bug #578542)


Modified:
   trunk/ChangeLog
   trunk/plugins/keyboard/gsd-keyboard-manager.c

Modified: trunk/plugins/keyboard/gsd-keyboard-manager.c
==============================================================================
--- trunk/plugins/keyboard/gsd-keyboard-manager.c	(original)
+++ trunk/plugins/keyboard/gsd-keyboard-manager.c	Sat Apr 11 16:19:47 2009
@@ -382,7 +382,7 @@
         manager->priv->have_xkb = 0;
         client = gconf_client_get_default ();
 
-        gconf_client_add_dir (client, GSD_KEYBOARD_KEY, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
+        gconf_client_add_dir (client, GSD_KEYBOARD_KEY, GCONF_CLIENT_PRELOAD_RECURSIVE, NULL);
 
         /* Essential - xkb initialization should happen before */
         gsd_keyboard_xkb_set_post_activation_callback ((PostActivationCallback) gsd_load_modmap_files, NULL);