[nautilus] navigation-window: ensure toolbar search button toggles as expected

[Cosimo Cecchi <cosimoc src gnome org>]

commit f84f5bb0379b0eea4a9e4e1df72f3038587269eb
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Thu Feb 10 13:40:25 2011 -0500

    navigation-window: ensure toolbar search button toggles as expected

 src/nautilus-navigation-window-pane.c |    2 ++
 src/nautilus-navigation-window.c      |    5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/src/nautilus-navigation-window-pane.c b/src/nautilus-navigation-window-pane.c
index 4644d9e..7cd8c6b 100644
--- a/src/nautilus-navigation-window-pane.c
+++ b/src/nautilus-navigation-window-pane.c
@@ -566,6 +566,8 @@ real_sync_location_widgets (NautilusWindowPane *pane)
 void
 nautilus_navigation_window_pane_hide_search_bar (NautilusNavigationWindowPane *pane)
 {
+	nautilus_toolbar_set_show_search_bar (NAUTILUS_TOOLBAR (pane->tool_bar), FALSE);
+
 	if (pane->temporary_search_bar) {
 		NautilusNavigationWindow *window;
 
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index e38bf0a..c4e7d2c 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -442,9 +442,8 @@ nautilus_navigation_window_hide_search (NautilusNavigationWindow *window)
 {
 	NautilusNavigationWindowPane *pane = NAUTILUS_NAVIGATION_WINDOW_PANE (NAUTILUS_WINDOW (window)->details->active_pane);
 
-	if (nautilus_navigation_window_pane_hide_temporary_bars (pane)) {
-		nautilus_navigation_window_restore_focus_widget (window);
-	}
+	nautilus_navigation_window_pane_hide_search_bar (pane);
+	nautilus_navigation_window_restore_focus_widget (window);
 }
 
 /* This updates the UI state of the search button, but does not