diff options
| author | Mike Engber <engber@src.gnome.org> | 2000-12-29 21:50:31 +0000 |
|---|---|---|
| committer | Mike Engber <engber@src.gnome.org> | 2000-12-29 21:50:31 +0000 |
| commit | 6c091215b4b304a542a46b4d60de82c701a958b1 (patch) | |
| tree | a2f6997fd05084359f9b5626c7640622804acf8a | |
| parent | caff61175ec3f4d15452da030cfb14d96f520a1a (diff) | |
| download | nautilus-6c091215b4b304a542a46b4d60de82c701a958b1.tar.gz | |
Changed gconf key for the show desktop option in order to avoid using the
* libnautilus-extensions/nautilus-global-preferences.h:
Changed gconf key for the show desktop option in order to
avoid using the old default value (OFF) in existing gconf
databases (bug 5148)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-global-preferences.h | 7 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-global-preferences.h | 7 |
3 files changed, 17 insertions, 4 deletions
@@ -1,3 +1,10 @@ +2000-12-29 Michael Engber <engber@eazel.com> + + * libnautilus-extensions/nautilus-global-preferences.h: + Changed gconf key for the show desktop option in order to + avoid using the old default value (OFF) in existing gconf + databases (bug 5148) + 2000-12-29 Andy Hertzfeld <andy@eazel.com> * src/file-manager/fm-list-view.c: diff --git a/libnautilus-extensions/nautilus-global-preferences.h b/libnautilus-extensions/nautilus-global-preferences.h index a3fdf4933..187cceef9 100644 --- a/libnautilus-extensions/nautilus-global-preferences.h +++ b/libnautilus-extensions/nautilus-global-preferences.h @@ -43,7 +43,6 @@ BEGIN_GNOME_DECLS #define NAUTILUS_PREFERENCES_SIDEBAR_WIDTH "/apps/nautilus/preferences/sidebar_width" /* Keep track of the sound playing process */ #define NAUTILUS_PREFERENCES_CURRENT_SOUND_STATE "/apps/nautilus/preferences/sound_state" -/* Show the desktop window or not */ /* * The following preferences are coupled to the user level. @@ -60,7 +59,11 @@ BEGIN_GNOME_DECLS #define NAUTILUS_PREFERENCES_CONFIRM_TRASH "preferences/confirm_trash" /* Desktop options */ -#define NAUTILUS_PREFERENCES_SHOW_DESKTOP "preferences/show_desktop" +/* - NAUTILUS_PREFERENCES_SHOW_DESKTOP used to be "preferences/show_desktop" + * The name was changed because the default changed (to TRUE), but was still + * in existing user gconf data. + */ +#define NAUTILUS_PREFERENCES_SHOW_DESKTOP "preferences/open_desktop_at_startup" /* Display */ #define NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES "preferences/show_hidden_files" diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h index a3fdf4933..187cceef9 100644 --- a/libnautilus-private/nautilus-global-preferences.h +++ b/libnautilus-private/nautilus-global-preferences.h @@ -43,7 +43,6 @@ BEGIN_GNOME_DECLS #define NAUTILUS_PREFERENCES_SIDEBAR_WIDTH "/apps/nautilus/preferences/sidebar_width" /* Keep track of the sound playing process */ #define NAUTILUS_PREFERENCES_CURRENT_SOUND_STATE "/apps/nautilus/preferences/sound_state" -/* Show the desktop window or not */ /* * The following preferences are coupled to the user level. @@ -60,7 +59,11 @@ BEGIN_GNOME_DECLS #define NAUTILUS_PREFERENCES_CONFIRM_TRASH "preferences/confirm_trash" /* Desktop options */ -#define NAUTILUS_PREFERENCES_SHOW_DESKTOP "preferences/show_desktop" +/* - NAUTILUS_PREFERENCES_SHOW_DESKTOP used to be "preferences/show_desktop" + * The name was changed because the default changed (to TRUE), but was still + * in existing user gconf data. + */ +#define NAUTILUS_PREFERENCES_SHOW_DESKTOP "preferences/open_desktop_at_startup" /* Display */ #define NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES "preferences/show_hidden_files" |