Commit f1fbd379 authored by Ramiro Estrugo's avatar Ramiro Estrugo

Removed the ETTORE user level easter egg and bullet proofed the

stuff that uses user levels a bit.
Removed switch handling of ETTORE user
level and added a default case for the unlikely (but poissible)
event when the ~/.gnome/nautilus preferences file contains bogus
values for the user_level enumeration.
parent 50735a65
2000-03-26 Ramiro Estrugo <ramiro@eazel.com>
Removed the ETTORE user level easter egg and bullet proofed the
stuff that uses user levels a bit.
* libnautilus/nautilus-global-preferences.c,
libnautilus/nautilus-global-preferences.h: Remove references to
NAUTILUS_USER_LEVEL_ETTORE.
* src/ntl-window-state.c: Removed switch handling of ETTORE user
level and added a default case for the unlikely (but poissible)
event when the ~/.gnome/nautilus preferences file contains bogus
values for the user_level enumeration.
* src/file-manager/fm-directory-view.c: Same as above.
2000-03-25 Andy Hertzfeld <andy@eazel.com>
Improved selection highlighting.
......
......@@ -68,24 +68,21 @@ static const char * const global_preferences_user_level_names[] =
{
"novice",
"intermediate",
"hacker",
"ettore"
"hacker"
};
static const char * const global_preferences_user_level_descriptions[] =
{
"Novice",
"Intermediate",
"Hacker",
"Ettore"
"Hacker"
};
static const gint global_preferences_user_level_values[] =
{
NAUTILUS_USER_LEVEL_NOVICE,
NAUTILUS_USER_LEVEL_INTERMEDIATE,
NAUTILUS_USER_LEVEL_HACKER,
NAUTILUS_USER_LEVEL_ETTORE
NAUTILUS_USER_LEVEL_HACKER
};
static const NautilusPreferencesEnumData global_preferences_user_level_data =
......
......@@ -54,8 +54,7 @@ enum
{
NAUTILUS_USER_LEVEL_NOVICE,
NAUTILUS_USER_LEVEL_INTERMEDIATE,
NAUTILUS_USER_LEVEL_HACKER,
NAUTILUS_USER_LEVEL_ETTORE
NAUTILUS_USER_LEVEL_HACKER
};
void nautilus_global_preferences_shutdown (void);
......
......@@ -68,24 +68,21 @@ static const char * const global_preferences_user_level_names[] =
{
"novice",
"intermediate",
"hacker",
"ettore"
"hacker"
};
static const char * const global_preferences_user_level_descriptions[] =
{
"Novice",
"Intermediate",
"Hacker",
"Ettore"
"Hacker"
};
static const gint global_preferences_user_level_values[] =
{
NAUTILUS_USER_LEVEL_NOVICE,
NAUTILUS_USER_LEVEL_INTERMEDIATE,
NAUTILUS_USER_LEVEL_HACKER,
NAUTILUS_USER_LEVEL_ETTORE
NAUTILUS_USER_LEVEL_HACKER
};
static const NautilusPreferencesEnumData global_preferences_user_level_data =
......
......@@ -54,8 +54,7 @@ enum
{
NAUTILUS_USER_LEVEL_NOVICE,
NAUTILUS_USER_LEVEL_INTERMEDIATE,
NAUTILUS_USER_LEVEL_HACKER,
NAUTILUS_USER_LEVEL_ETTORE
NAUTILUS_USER_LEVEL_HACKER
};
void nautilus_global_preferences_shutdown (void);
......
......@@ -68,24 +68,21 @@ static const char * const global_preferences_user_level_names[] =
{
"novice",
"intermediate",
"hacker",
"ettore"
"hacker"
};
static const char * const global_preferences_user_level_descriptions[] =
{
"Novice",
"Intermediate",
"Hacker",
"Ettore"
"Hacker"
};
static const gint global_preferences_user_level_values[] =
{
NAUTILUS_USER_LEVEL_NOVICE,
NAUTILUS_USER_LEVEL_INTERMEDIATE,
NAUTILUS_USER_LEVEL_HACKER,
NAUTILUS_USER_LEVEL_ETTORE
NAUTILUS_USER_LEVEL_HACKER
};
static const NautilusPreferencesEnumData global_preferences_user_level_data =
......
......@@ -54,8 +54,7 @@ enum
{
NAUTILUS_USER_LEVEL_NOVICE,
NAUTILUS_USER_LEVEL_INTERMEDIATE,
NAUTILUS_USER_LEVEL_HACKER,
NAUTILUS_USER_LEVEL_ETTORE
NAUTILUS_USER_LEVEL_HACKER
};
void nautilus_global_preferences_shutdown (void);
......
......@@ -931,11 +931,8 @@ queue_pending_files (FMDirectoryView *view,
break;
case NAUTILUS_USER_LEVEL_HACKER:
case NAUTILUS_USER_LEVEL_ETTORE:
break;
default:
g_assert_not_reached ();
break;
}
/* Put the files on the pending list if there are any. */
......
......@@ -58,7 +58,7 @@ nautilus_window_set_initial_state (NautilusWindow *window, const char *initial_u
case NAUTILUS_USER_LEVEL_INTERMEDIATE:
case NAUTILUS_USER_LEVEL_HACKER:
case NAUTILUS_USER_LEVEL_ETTORE:
default:
g_string_append (path_name, g_get_home_dir ());
break;
}
......
......@@ -58,7 +58,7 @@ nautilus_window_set_initial_state (NautilusWindow *window, const char *initial_u
case NAUTILUS_USER_LEVEL_INTERMEDIATE:
case NAUTILUS_USER_LEVEL_HACKER:
case NAUTILUS_USER_LEVEL_ETTORE:
default:
g_string_append (path_name, g_get_home_dir ());
break;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment