Commit 7dc8ae2e authored by Seth Nickell's avatar Seth Nickell Committed by Seth Nickell
Browse files

Fix the condition of assertions when toggling the desktop directory

2001-04-20  Seth Nickell  <snickell@stanford.edu>

	* libnautilus-extensions/nautilus-global-preferences.c:
	* src/nautilus-application.c: (desktop_location_changed_callback):
	Fix the condition of assertions when toggling the desktop directory
	location if the desktop window is not being displayed.
parent f7123c7d
2001-04-20 Seth Nickell <snickell@stanford.edu>
* libnautilus-extensions/nautilus-global-preferences.c:
* src/nautilus-application.c: (desktop_location_changed_callback):
Fix the condition of assertions when toggling the desktop directory
location if the desktop window is not being displayed.
2001-04-20 Ramiro Estrugo <ramiro@eazel.com>
* src/nautilus-preferences-dialog.c:
......
......@@ -406,7 +406,7 @@ static const PreferenceDefault preference_defaults[] = {
},
{ NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR,
PREFERENCE_BOOLEAN,
NAUTILUS_USER_LEVEL_ADVANCED,
NAUTILUS_USER_LEVEL_INTERMEDIATE,
{ NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) },
{ USER_LEVEL_NONE }
},
......
......@@ -406,7 +406,7 @@ static const PreferenceDefault preference_defaults[] = {
},
{ NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR,
PREFERENCE_BOOLEAN,
NAUTILUS_USER_LEVEL_ADVANCED,
NAUTILUS_USER_LEVEL_INTERMEDIATE,
{ NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) },
{ USER_LEVEL_NONE }
},
......
......@@ -693,9 +693,12 @@ static void
desktop_location_changed_callback (gpointer user_data)
{
NautilusDesktopWindow *desktop_window;
desktop_window = NAUTILUS_DESKTOP_WINDOW (user_data);
nautilus_desktop_window_update_directory (desktop_window);
if (user_data != NULL && NAUTILUS_IS_DESKTOP_WINDOW (user_data)) {
desktop_window = NAUTILUS_DESKTOP_WINDOW (user_data);
nautilus_desktop_window_update_directory (desktop_window);
}
}
/* callback for showing or hiding the desktop based on the user's preference */
......
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