diff options
| author | John Sullivan <sullivan@eazel.com> | 2001-03-12 17:10:11 +0000 |
|---|---|---|
| committer | John Sullivan <sullivan@src.gnome.org> | 2001-03-12 17:10:11 +0000 |
| commit | 644e3ad630fff3fa3339fd651578068437a96b7f (patch) | |
| tree | 6fffd18c15d41685cebc5113f7259ee34b39c82d | |
| parent | 50a4855d7615a037581f11fde89567e93d90c666 (diff) | |
| download | nautilus-644e3ad630fff3fa3339fd651578068437a96b7f.tar.gz | |
Merge from HEAD:
2001-03-12 John Sullivan <sullivan@eazel.com>
reviewed by: Ramiro Estrugo <ramiro@eazel.com>
Fixed bug 7666 (default user level should be Intermediate)
* libnautilus-extensions/nautilus-preferences.c:
(nautilus_preferences_get_user_level): Reworked function a
little to support explicit default; made Intermediate the
default.
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-preferences.c | 11 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-preferences.c | 11 |
3 files changed, 29 insertions, 8 deletions
@@ -1,3 +1,18 @@ +2001-03-12 John Sullivan <sullivan@eazel.com> + + Merge from HEAD: + + 2001-03-12 John Sullivan <sullivan@eazel.com> + + reviewed by: Ramiro Estrugo <ramiro@eazel.com> + + Fixed bug 7666 (default user level should be Intermediate) + + * libnautilus-extensions/nautilus-preferences.c: + (nautilus_preferences_get_user_level): Reworked function a + little to support explicit default; made Intermediate the + default. + 2001-03-12 Robin * Slomkowski <rslomkow@rslomkow.org> * configure.in: upped version to 1.0, upped version required diff --git a/libnautilus-extensions/nautilus-preferences.c b/libnautilus-extensions/nautilus-preferences.c index 8d7e24194..f800cad33 100644 --- a/libnautilus-extensions/nautilus-preferences.c +++ b/libnautilus-extensions/nautilus-preferences.c @@ -42,6 +42,7 @@ #include <libgnomeui/gnome-dialog.h> #include <libgnomeui/gnome-dialog-util.h> +#define DEFAULT_USER_LEVEL NAUTILUS_USER_LEVEL_INTERMEDIATE /* * PreferencesEntry: @@ -557,7 +558,7 @@ nautilus_preferences_get_user_level (void) { char *key; char *user_level; - int result = 0; + int result; /* This is a little silly, but it is technically possible * to have different user_level defaults in each user level. @@ -576,11 +577,13 @@ nautilus_preferences_get_user_level (void) g_free (key); if (nautilus_str_is_equal (user_level, "advanced")) { - result = 2; + result = NAUTILUS_USER_LEVEL_ADVANCED; } else if (nautilus_str_is_equal (user_level, "intermediate")) { - result = 1; + result = NAUTILUS_USER_LEVEL_INTERMEDIATE; + } else if (nautilus_str_is_equal (user_level, "novice")) { + result = NAUTILUS_USER_LEVEL_NOVICE; } else { - result = 0; + result = DEFAULT_USER_LEVEL; } g_free (user_level); diff --git a/libnautilus-private/nautilus-preferences.c b/libnautilus-private/nautilus-preferences.c index 8d7e24194..f800cad33 100644 --- a/libnautilus-private/nautilus-preferences.c +++ b/libnautilus-private/nautilus-preferences.c @@ -42,6 +42,7 @@ #include <libgnomeui/gnome-dialog.h> #include <libgnomeui/gnome-dialog-util.h> +#define DEFAULT_USER_LEVEL NAUTILUS_USER_LEVEL_INTERMEDIATE /* * PreferencesEntry: @@ -557,7 +558,7 @@ nautilus_preferences_get_user_level (void) { char *key; char *user_level; - int result = 0; + int result; /* This is a little silly, but it is technically possible * to have different user_level defaults in each user level. @@ -576,11 +577,13 @@ nautilus_preferences_get_user_level (void) g_free (key); if (nautilus_str_is_equal (user_level, "advanced")) { - result = 2; + result = NAUTILUS_USER_LEVEL_ADVANCED; } else if (nautilus_str_is_equal (user_level, "intermediate")) { - result = 1; + result = NAUTILUS_USER_LEVEL_INTERMEDIATE; + } else if (nautilus_str_is_equal (user_level, "novice")) { + result = NAUTILUS_USER_LEVEL_NOVICE; } else { - result = 0; + result = DEFAULT_USER_LEVEL; } g_free (user_level); |