[nautilus/gnome-3-6] window: don't make the sidebar setting apply to all the windows

[Cosimo Cecchi <cosimoc src gnome org>]

commit d5f6ec591097de0b0ebc694034ddff940daade7f
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Wed Sep 19 11:20:42 2012 -0400

    window: don't make the sidebar setting apply to all the windows
    
    But only make it modify the behavior of the current window. This makes
    it consistent with the placement of the option in the menus.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=682064

 src/nautilus-window-menus.c |   19 -------------------
 src/nautilus-window.c       |    2 --
 2 files changed, 0 insertions(+), 21 deletions(-)
---
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index a4b70ca..a61fb24 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -615,24 +615,6 @@ static const gchar* app_actions[] = {
 };
 
 static void
-window_menus_set_bindings (NautilusWindow *window)
-{
-       GtkActionGroup *action_group;
-       GtkAction *action;
-
-       action_group = nautilus_window_get_main_action_group (window);
-
-       action = gtk_action_group_get_action (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);
-}
-
-static void
 action_toggle_state (GSimpleAction *action,
 		     GVariant *parameter,
 		     gpointer user_data)
@@ -655,7 +637,6 @@ nautilus_window_initialize_actions (NautilusWindow *window)
 	g_action_map_add_action_entries (G_ACTION_MAP (window),
 					 win_entries, G_N_ELEMENTS (win_entries),
 					 window);
-	window_menus_set_bindings (window);
 }
 
 static void
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 13408fc..b09bd5e 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -599,7 +599,6 @@ nautilus_window_hide_sidebar (NautilusWindow *window)
 	}
 
 	nautilus_window_tear_down_sidebar (window);
-	g_settings_set_boolean (nautilus_window_state, NAUTILUS_WINDOW_STATE_START_WITH_SIDEBAR, FALSE);
 }
 
 void
@@ -616,7 +615,6 @@ nautilus_window_show_sidebar (NautilusWindow *window)
 	}
 
 	nautilus_window_set_up_sidebar (window);
-	g_settings_set_boolean (nautilus_window_state, NAUTILUS_WINDOW_STATE_START_WITH_SIDEBAR, TRUE);
 }
 
 gboolean