[nautilus] navigation-window: remove methods to toggle toolbar visibility

[Cosimo Cecchi <cosimoc src gnome org>]

commit b34fb9648fcd58f17e09590e2dc9e0dae8af3757
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Feb 9 18:20:23 2011 -0500

    navigation-window: remove methods to toggle toolbar visibility
    
    This will be done automatically by NautilusToolbar and inside the methods to
    trigger temporary visibility.

 src/nautilus-navigation-window.c |   64 ++++++++------------------------------
 src/nautilus-navigation-window.h |   11 ------
 2 files changed, 13 insertions(+), 62 deletions(-)
---
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index a259a85..5a402e0 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -168,7 +168,7 @@ use_extra_mouse_buttons_changed (gpointer callback_data)
 	mouse_extra_buttons = g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_MOUSE_USE_EXTRA_BUTTONS);
 }
 
-void
+static void
 nautilus_navigation_window_unset_focus_widget (NautilusNavigationWindow *window)
 {
 	if (window->details->last_focus_widget != NULL) {
@@ -178,35 +178,24 @@ nautilus_navigation_window_unset_focus_widget (NautilusNavigationWindow *window)
 	}
 }
 
-gboolean
-nautilus_navigation_window_is_in_temporary_navigation_bar (GtkWidget *widget,
-				NautilusNavigationWindow *window)
+static gboolean
+nautilus_navigation_window_is_in_temporary_bars (GtkWidget *widget,
+						 NautilusNavigationWindow *window)
 {
 	GList *walk;
 	gboolean is_in_any = FALSE;
+	NautilusNavigationWindowPane *pane;
 
-	for (walk = NAUTILUS_WINDOW(window)->details->panes; walk; walk = walk->next) {
-		NautilusNavigationWindowPane *pane = walk->data;
-		if(gtk_widget_get_ancestor (widget, NAUTILUS_TYPE_LOCATION_BAR) != NULL &&
-			       pane->temporary_navigation_bar)
-			is_in_any = TRUE;
-	}
-	return is_in_any;
-}
-
-gboolean
-nautilus_navigation_window_is_in_temporary_search_bar (GtkWidget *widget,
-			    NautilusNavigationWindow *window)
-{
-	GList *walk;
-	gboolean is_in_any = FALSE;
+	for (walk = NAUTILUS_WINDOW (window)->details->panes; walk; walk = walk->next) {
+		pane = walk->data;
 
-	for (walk = NAUTILUS_WINDOW(window)->details->panes; walk; walk = walk->next) {
-		NautilusNavigationWindowPane *pane = walk->data;
-		if(gtk_widget_get_ancestor (widget, NAUTILUS_TYPE_SEARCH_BAR) != NULL &&
-				       pane->temporary_search_bar)
+		if ((gtk_widget_get_ancestor (widget, NAUTILUS_TYPE_LOCATION_BAR) != NULL &&
+		    pane->temporary_navigation_bar) ||
+		    (gtk_widget_get_ancestor (widget, NAUTILUS_TYPE_SEARCH_BAR) != NULL &&
+		     pane->temporary_search_bar))
 			is_in_any = TRUE;
 	}
+
 	return is_in_any;
 }
 
@@ -220,8 +209,7 @@ remember_focus_widget (NautilusNavigationWindow *window)
 
 	focus_widget = gtk_window_get_focus (GTK_WINDOW (window));
 	if (focus_widget != NULL &&
-	    !nautilus_navigation_window_is_in_temporary_navigation_bar (focus_widget, navigation_window) &&
-	    !nautilus_navigation_window_is_in_temporary_search_bar (focus_widget, navigation_window)) {
+	    !nautilus_navigation_window_is_in_temporary_bars (focus_widget, navigation_window)) {
 		nautilus_navigation_window_unset_focus_widget (navigation_window);
 
 		navigation_window->details->last_focus_widget = focus_widget;
@@ -505,16 +493,6 @@ nautilus_navigation_window_set_search_button (NautilusNavigationWindow *window,
 	g_object_set_data (G_OBJECT (action), "blocked", NULL);
 }
 
-gboolean
-nautilus_navigation_window_toolbar_showing (NautilusNavigationWindow *window)
-{
-	if (window->details->toolbar != NULL) {
-		return gtk_widget_get_visible (window->details->toolbar);
-	}
-	/* If we're not visible yet we haven't changed visibility, so its TRUE */
-	return TRUE;
-}
-
 void
 nautilus_navigation_window_hide_status_bar (NautilusNavigationWindow *window)
 {
@@ -544,22 +522,6 @@ nautilus_navigation_window_status_bar_showing (NautilusNavigationWindow *window)
 }
 
 
-void
-nautilus_navigation_window_hide_toolbar (NautilusNavigationWindow *window)
-{
-	gtk_widget_hide (window->details->toolbar);
-	nautilus_navigation_window_update_show_hide_menu_items (window);
-	g_settings_set_boolean (nautilus_window_state, NAUTILUS_WINDOW_STATE_START_WITH_TOOLBAR, FALSE);
-}
-
-void
-nautilus_navigation_window_show_toolbar (NautilusNavigationWindow *window)
-{
-	gtk_widget_show (window->details->toolbar);
-	nautilus_navigation_window_update_show_hide_menu_items (window);
-	g_settings_set_boolean (nautilus_window_state, NAUTILUS_WINDOW_STATE_START_WITH_TOOLBAR, TRUE);
-}
-
 /**
  * nautilus_navigation_window_get_base_page_index:
  * @window:	Window to get index from
diff --git a/src/nautilus-navigation-window.h b/src/nautilus-navigation-window.h
index c3a0c90..8f669f4 100644
--- a/src/nautilus-navigation-window.h
+++ b/src/nautilus-navigation-window.h
@@ -31,10 +31,8 @@
 #define NAUTILUS_NAVIGATION_WINDOW_H
 
 #include <gtk/gtk.h>
-#include <eel/eel-glib-extensions.h>
 #include <libnautilus-private/nautilus-bookmark.h>
 
-#include "nautilus-application.h"
 #include "nautilus-window.h"
 
 #define NAUTILUS_TYPE_NAVIGATION_WINDOW nautilus_navigation_window_get_type()
@@ -75,9 +73,6 @@ void     nautilus_navigation_window_clear_back_list      (NautilusNavigationWind
 void     nautilus_navigation_window_clear_forward_list   (NautilusNavigationWindow *window);
 void     nautilus_forget_history                         (void);
 gint     nautilus_navigation_window_get_base_page_index  (NautilusNavigationWindow *window);
-void     nautilus_navigation_window_hide_toolbar         (NautilusNavigationWindow *window);
-void     nautilus_navigation_window_show_toolbar         (NautilusNavigationWindow *window);
-gboolean nautilus_navigation_window_toolbar_showing      (NautilusNavigationWindow *window);
 void     nautilus_navigation_window_hide_sidebar         (NautilusNavigationWindow *window);
 void     nautilus_navigation_window_show_sidebar         (NautilusNavigationWindow *window);
 gboolean nautilus_navigation_window_sidebar_showing      (NautilusNavigationWindow *window);
@@ -89,7 +84,6 @@ void     nautilus_navigation_window_back_or_forward      (NautilusNavigationWind
                                                           guint                     distance,
 							  gboolean                  new_tab);
 void     nautilus_navigation_window_show_search          (NautilusNavigationWindow *window);
-void     nautilus_navigation_window_unset_focus_widget   (NautilusNavigationWindow *window);
 void     nautilus_navigation_window_hide_search          (NautilusNavigationWindow *window);
 void     nautilus_navigation_window_set_search_button	 (NautilusNavigationWindow *window,
                                                           gboolean		    state);
@@ -98,9 +92,4 @@ void     nautilus_navigation_window_split_view_on        (NautilusNavigationWind
 void     nautilus_navigation_window_split_view_off       (NautilusNavigationWindow *window);
 gboolean nautilus_navigation_window_split_view_showing   (NautilusNavigationWindow *window);
 
-gboolean nautilus_navigation_window_is_in_temporary_navigation_bar (GtkWidget *widget,
-				NautilusNavigationWindow *window);
-gboolean nautilus_navigation_window_is_in_temporary_search_bar (GtkWidget *widget,
-			    NautilusNavigationWindow *window);
-
 #endif