gnome-settings-daemon r813 - in trunk: . plugins/keybindings

[jensg svn gnome org]

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

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

	* plugins/keybindings/gsd-keybindings-manager.c:
	(gsd_keybindings_manager_start): move the lookup of allowed keys
	after the directory has been cached in callback registration to avoid
	GConf roundtrip (bug #578539)


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

Modified: trunk/plugins/keybindings/gsd-keybindings-manager.c
==============================================================================
--- trunk/plugins/keybindings/gsd-keybindings-manager.c	(original)
+++ trunk/plugins/keybindings/gsd-keybindings-manager.c	Sat Apr 11 16:25:12 2009
@@ -565,15 +565,16 @@
 
         client = gconf_client_get_default ();
 
-        manager->priv->allowed_keys = gconf_client_get_list (client,
-                                                             ALLOWED_KEYS_KEY,
-                                                             GCONF_VALUE_STRING,
-                                                             NULL);
         manager->priv->notify = register_config_callback (manager,
                                                           client,
                                                           GCONF_BINDING_DIR,
                                                           (GConfClientNotifyFunc) bindings_callback);
 
+        manager->priv->allowed_keys = gconf_client_get_list (client,
+                                                             ALLOWED_KEYS_KEY,
+                                                             GCONF_VALUE_STRING,
+                                                             NULL);
+
         dpy = gdk_display_get_default ();
         screen_num = gdk_display_get_n_screens (dpy);