summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog-2000041416
-rw-r--r--libnautilus-extensions/nautilus-global-preferences.c9
-rw-r--r--libnautilus-extensions/nautilus-global-preferences.h3
-rw-r--r--libnautilus-private/nautilus-global-preferences.c9
-rw-r--r--libnautilus-private/nautilus-global-preferences.h3
-rw-r--r--libnautilus/nautilus-global-preferences.c9
-rw-r--r--libnautilus/nautilus-global-preferences.h3
-rw-r--r--src/file-manager/fm-directory-view.c5
-rw-r--r--src/nautilus-window-state.c2
-rw-r--r--src/ntl-window-state.c2
10 files changed, 31 insertions, 30 deletions
diff --git a/ChangeLog-20000414 b/ChangeLog-20000414
index 01c698936..b628c49ba 100644
--- a/ChangeLog-20000414
+++ b/ChangeLog-20000414
@@ -1,3 +1,19 @@
+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.
diff --git a/libnautilus-extensions/nautilus-global-preferences.c b/libnautilus-extensions/nautilus-global-preferences.c
index 79fca8ca1..65ce157d8 100644
--- a/libnautilus-extensions/nautilus-global-preferences.c
+++ b/libnautilus-extensions/nautilus-global-preferences.c
@@ -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 =
diff --git a/libnautilus-extensions/nautilus-global-preferences.h b/libnautilus-extensions/nautilus-global-preferences.h
index 0664b8be8..accb6879a 100644
--- a/libnautilus-extensions/nautilus-global-preferences.h
+++ b/libnautilus-extensions/nautilus-global-preferences.h
@@ -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);
diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c
index 79fca8ca1..65ce157d8 100644
--- a/libnautilus-private/nautilus-global-preferences.c
+++ b/libnautilus-private/nautilus-global-preferences.c
@@ -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 =
diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h
index 0664b8be8..accb6879a 100644
--- a/libnautilus-private/nautilus-global-preferences.h
+++ b/libnautilus-private/nautilus-global-preferences.h
@@ -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);
diff --git a/libnautilus/nautilus-global-preferences.c b/libnautilus/nautilus-global-preferences.c
index 79fca8ca1..65ce157d8 100644
--- a/libnautilus/nautilus-global-preferences.c
+++ b/libnautilus/nautilus-global-preferences.c
@@ -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 =
diff --git a/libnautilus/nautilus-global-preferences.h b/libnautilus/nautilus-global-preferences.h
index 0664b8be8..accb6879a 100644
--- a/libnautilus/nautilus-global-preferences.h
+++ b/libnautilus/nautilus-global-preferences.h
@@ -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);
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 9c8d594fc..63e0f321c 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -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. */
diff --git a/src/nautilus-window-state.c b/src/nautilus-window-state.c
index 207fd61c4..4d063d3d1 100644
--- a/src/nautilus-window-state.c
+++ b/src/nautilus-window-state.c
@@ -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;
}
diff --git a/src/ntl-window-state.c b/src/ntl-window-state.c
index 207fd61c4..4d063d3d1 100644
--- a/src/ntl-window-state.c
+++ b/src/ntl-window-state.c
@@ -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;
}
View Lorry Controller Status