Always show the status bar if the window is a spatial one. Fixes 138967.

2004-04-08  James Willcox  <jwillcox@gnome.org>

	* src/nautilus-navigation-window.c:
	(nautilus_navigation_window_show):
	* src/nautilus-spatial-window.c: (nautilus_spatial_window_show):
	* src/nautilus-window.c: (nautilus_window_show):

        Always show the status bar if the window is a spatial one.
	Fixes 138967.

4 files changed, 19 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 60305c418..23f8547a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-04-08  James Willcox  <jwillcox@gnome.org>
+
+	* src/nautilus-navigation-window.c:
+	(nautilus_navigation_window_show):
+	* src/nautilus-spatial-window.c: (nautilus_spatial_window_show):
+	* src/nautilus-window.c: (nautilus_window_show):
+
+        Always show the status bar if the window is a spatial one.
+	Fixes 138967.
+
 2004-04-07  Alexander Larsson  <alexl@redhat.com>
 
 	* libnautilus-private/nautilus-program-choosing.c:
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index d89f1ca72..8db7664a2 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -1467,6 +1467,12 @@ nautilus_navigation_window_show (GtkWidget *widget)
 		nautilus_navigation_window_hide_sidebar (window);
 	}
 
+	if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_STATUS_BAR)) {
+		nautilus_window_show_status_bar (NAUTILUS_WINDOW (window));
+	} else {
+		nautilus_window_hide_status_bar (NAUTILUS_WINDOW (window));
+	}
+
 	GTK_WIDGET_CLASS (parent_class)->show (widget);
 }
 
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index a6f76f6ce..77f99bcc4 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -269,7 +269,7 @@ nautilus_spatial_window_show (GtkWidget *widget)
 	NautilusSpatialWindow *window;
 
 	window = NAUTILUS_SPATIAL_WINDOW (widget);
-
+	
 	GTK_WIDGET_CLASS (parent_class)->show (widget);
 }
 
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 339c41130..897644a93 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -1353,14 +1353,9 @@ nautilus_window_show (GtkWidget *widget)
 
 	window = NAUTILUS_WINDOW (widget);
 
-	GTK_WIDGET_CLASS (parent_class)->show (widget);
-
-	if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_STATUS_BAR)) {
-		nautilus_window_show_status_bar (window);
-	} else {
-		nautilus_window_hide_status_bar (window);
-	}
 
+	GTK_WIDGET_CLASS (parent_class)->show (widget);
+	
 	nautilus_window_ui_update (window);
 }