Keep the desktop from creating sidebar panels (it still has the sidebar) -

	* src/nautilus-window.c: (nautilus_window_constructed),
	(update_sidebar_panels_from_preferences):
	Keep the desktop from creating sidebar panels (it still
	has the sidebar) - bug 2603.

1 files changed, 12 insertions, 0 deletions

diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 8afa9c12c..92870b64f 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -501,6 +501,10 @@ nautilus_window_constructed (NautilusWindow *window)
 	
 	bonobo_ui_component_freeze (window->details->shell_ui, NULL);
 
+	/* FIXME bugzilla.eazel.com 1243: 
+	 * We should use inheritance instead of these special cases
+	 * for the desktop window.
+	 */
 	if (NAUTILUS_IS_DESKTOP_WINDOW (window)) {
 		nautilus_bonobo_set_hidden (window->details->shell_ui,
 					    LOCATION_BAR_PATH, TRUE);
@@ -1547,6 +1551,14 @@ update_sidebar_panels_from_preferences (NautilusWindow *window)
 
 	g_assert (NAUTILUS_IS_WINDOW (window));
 
+	/* FIXME bugzilla.eazel.com 1243: 
+	 * We should use inheritance instead of these special cases
+	 * for the desktop window.
+	 */
+	if (NAUTILUS_IS_DESKTOP_WINDOW (window)) {
+		return;
+	}
+
 	/* Obtain list of enabled view identifiers */
 	identifier_list = nautilus_global_preferences_get_enabled_sidebar_panel_view_identifiers ();
 	nautilus_window_set_sidebar_panels (window, identifier_list);