nautilus r15023 - in trunk: . libnautilus-private

[alexl svn gnome org]

Author: alexl
Date: Thu Feb 26 07:36:50 2009
New Revision: 15023
URL: http://svn.gnome.org/viewvc/nautilus?rev=15023&view=rev

Log:
2009-02-26  Alexander Larsson  <alexl redhat com>

        * libnautilus-private/nautilus-global-preferences.c:
        (nautilus_global_preferences_init):
	Remove monitoring of old gnome-vfs gconf directory.
	Preload the gconf directories that are used on startup.




Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-global-preferences.c

Modified: trunk/libnautilus-private/nautilus-global-preferences.c
==============================================================================
--- trunk/libnautilus-private/nautilus-global-preferences.c	(original)
+++ trunk/libnautilus-private/nautilus-global-preferences.c	Thu Feb 26 07:36:50 2009
@@ -40,8 +40,7 @@
 #define PREFERENCES_SORT_ORDER_MANUALLY 100
 
 /* Path for gnome-vfs preferences */
-static const char *EXTRA_MONITOR_PATHS[] = { "/system/gnome_vfs",
-					     "/desktop/gnome/file_views",
+static const char *EXTRA_MONITOR_PATHS[] = { "/desktop/gnome/file_views",
 					     NULL };
 
 /* Forward declarations */
@@ -819,4 +818,12 @@
 	/* Preload everything in a big batch */
 	eel_gconf_preload_cache ("/apps/nautilus/preferences",
 				 GCONF_CLIENT_PRELOAD_ONELEVEL);
+	eel_gconf_preload_cache ("/desktop/gnome/file_views",
+				 GCONF_CLIENT_PRELOAD_ONELEVEL);
+	
+	/* These are always needed for the desktop */
+	eel_gconf_preload_cache ("/apps/nautilus/desktop",
+				 GCONF_CLIENT_PRELOAD_ONELEVEL);
+	eel_gconf_preload_cache ("/apps/nautilus/icon_view",
+				 GCONF_CLIENT_PRELOAD_ONELEVEL);
 }