Remove monitoring of old gnome-vfs gconf directory. Preload the gconf

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.



svn path=/trunk/; revision=15023
This commit is contained in:
Alexander Larsson 2009-02-26 07:36:50 +00:00 committed by Alexander Larsson
parent 23474d5f06
commit 8b202d7fa7
2 changed files with 16 additions and 2 deletions

View file

@ -1,3 +1,10 @@
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.
2009-02-26 Alexander Larsson <alexl@redhat.com>
* src/file-manager/fm-directory-view.c (add_submenu):

View file

@ -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 @@ nautilus_global_preferences_init (void)
/* 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);
}