[nautilus] navigation-window: use g_settings_bind() a little more

[Cosimo Cecchi <cosimoc src gnome org>]

commit 600352c410a57214cc8fbb9789cf6b43dde55388
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Feb 15 15:12:57 2011 -0500

    navigation-window: use g_settings_bind() a little more

 src/nautilus-navigation-window-menus.c |   14 +++++++++-----
 src/nautilus-navigation-window.c       |    9 ---------
 src/nautilus-navigation-window.h       |    1 -
 3 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index cfea3e0..a20480e 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -238,11 +238,6 @@ nautilus_navigation_window_update_show_hide_menu_items (NautilusNavigationWindow
 	g_assert (NAUTILUS_IS_NAVIGATION_WINDOW (window));
 
 	action = gtk_action_group_get_action (window->details->navigation_action_group,
-					      NAUTILUS_ACTION_SHOW_HIDE_SIDEBAR);
-	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
-				      nautilus_navigation_window_sidebar_showing (window));
-	
-	action = gtk_action_group_get_action (window->details->navigation_action_group,
 					      NAUTILUS_ACTION_SHOW_HIDE_EXTRA_PANE);
 	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
 				      nautilus_navigation_window_split_view_showing (window));
@@ -966,6 +961,15 @@ navigation_window_menus_set_bindings (NautilusNavigationWindow *window)
 			 action,
 			 "active",
 			 G_SETTINGS_BIND_DEFAULT);
+
+	action = gtk_action_group_get_action (window->details->navigation_action_group,
+					      NAUTILUS_ACTION_SHOW_HIDE_SIDEBAR);	
+
+	g_settings_bind (nautilus_window_state,
+			 NAUTILUS_WINDOW_STATE_START_WITH_SIDEBAR,
+			 action,
+			 "active",
+			 G_SETTINGS_BIND_DEFAULT);
 }
 
 /**
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index a935d4f..4228275 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -718,15 +718,6 @@ nautilus_navigation_window_show_sidebar (NautilusNavigationWindow *window)
 	g_settings_set_boolean (nautilus_window_state, NAUTILUS_WINDOW_STATE_START_WITH_SIDEBAR, TRUE);
 }
 
-gboolean
-nautilus_navigation_window_sidebar_showing (NautilusNavigationWindow *window)
-{
-	g_return_val_if_fail (NAUTILUS_IS_NAVIGATION_WINDOW (window), FALSE);
-
-	return (window->details->sidebar != NULL)
-		&& gtk_widget_get_visible (gtk_paned_get_child1 (GTK_PANED (window->details->content_paned)));
-}
-
 static void
 side_pane_id_changed (NautilusNavigationWindow *window)
 {
diff --git a/src/nautilus-navigation-window.h b/src/nautilus-navigation-window.h
index 9cc4228..4e391eb 100644
--- a/src/nautilus-navigation-window.h
+++ b/src/nautilus-navigation-window.h
@@ -75,7 +75,6 @@ void     nautilus_forget_history                         (void);
 gint     nautilus_navigation_window_get_base_page_index  (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);
 void     nautilus_navigation_window_back_or_forward      (NautilusNavigationWindow *window,
                                                           gboolean                  back,
                                                           guint                     distance,