toolbar: Fix updating the state of the "Up" button.

When there's no parent folder, the Up button should be disabled.

The menubar item was being disabled, but the toolbar button belongs
in a different action group, and wasn't being updated.

Author: mtwebster

src/nemo-window-manage-views.c

@@ -1490,7 +1490,7 @@ update_for_new_location (NemoWindowSlot *slot)
 
 	if (slot == nemo_window_get_active_slot (window)) {
 		/* Sync up and zoom action states */
-		nemo_window_sync_up_button (window);
+		nemo_window_pane_sync_up_actions (slot->pane);
 		nemo_window_sync_zoom_widgets (window);
         nemo_window_sync_bookmark_action (window);
         nemo_window_sync_view_type (window);

src/nemo-window-pane.c

@@ -1055,6 +1055,41 @@ nemo_window_pane_set_active (NemoWindowPane *pane,
 	nemo_window_pane_set_active_style (pane, is_active);
 }
 
+void
+nemo_window_pane_sync_up_actions (NemoWindowPane *pane)
+{
+    NemoWindowSlot *slot;
+    GFile *parent;
+    GtkActionGroup *action_group;
+    GtkAction *action;
+    gboolean allowed;
+
+    slot = pane->active_slot;
+
+    allowed = FALSE;
+    if (slot->location != NULL) {
+        parent = g_file_get_parent (slot->location);
+        allowed = parent != NULL;
+
+        g_clear_object (&parent);
+    }
+
+    action_group = pane->toolbar_action_group;
+
+    action = gtk_action_group_get_action (action_group,
+                                          NEMO_ACTION_UP);
+    gtk_action_set_sensitive (action, allowed);
+
+    action_group = nemo_window_get_main_action_group (pane->window);
+
+    action = gtk_action_group_get_action (action_group,
+                                          NEMO_ACTION_UP);
+    gtk_action_set_sensitive (action, allowed);
+    action = gtk_action_group_get_action (action_group,
+                          NEMO_ACTION_UP_ACCEL);
+    gtk_action_set_sensitive (action, allowed);
+}
+
 GtkActionGroup *
 nemo_window_pane_get_toolbar_action_group (NemoWindowPane *pane)
 {
@@ -1086,7 +1121,7 @@ nemo_window_pane_sync_location_widgets (NemoWindowPane *pane)
 
 	/* Update window global UI if this is the active pane */
 	if (pane == nemo_window_get_active_pane (pane->window)) {
-		nemo_window_sync_up_button (pane->window);
+        nemo_window_pane_sync_up_actions (pane);
 
 		/* Check if the back and forward buttons need enabling or disabling. */
 		active_slot = nemo_window_get_active_slot (pane->window);

src/nemo-window-pane.h

@@ -101,7 +101,7 @@ void nemo_window_pane_set_active (NemoWindowPane *pane, gboolean is_active);
 void nemo_window_pane_close_slot (NemoWindowPane *pane, NemoWindowSlot *slot);
 GtkActionGroup * nemo_window_pane_get_toolbar_action_group (NemoWindowPane   *pane);
 void nemo_window_pane_grab_focus (NemoWindowPane *pane);
-
+void nemo_window_pane_sync_up_actions (NemoWindowPane *pane);
 /* bars */
 void     nemo_window_pane_ensure_location_bar (NemoWindowPane *pane);
 

src/nemo-window-private.h

@@ -157,7 +157,6 @@ void nemo_window_sync_allow_stop       (NemoWindow *window,
 void nemo_window_sync_title            (NemoWindow *window,
 					    NemoWindowSlot *slot);
 void nemo_window_sync_zoom_widgets     (NemoWindow *window);
-void nemo_window_sync_up_button        (NemoWindow *window);
 void nemo_window_sync_menu_bar         (NemoWindow *window);
 void nemo_window_sync_bookmark_action  (NemoWindow *window);
 void nemo_window_sync_thumbnail_action (NemoWindow *window);

src/nemo-window.c

@@ -1361,35 +1361,6 @@ nemo_window_sync_menu_bar (NemoWindow *window)
     }
 }
 
-void
-nemo_window_sync_up_button (NemoWindow *window)
-{
-	GtkAction *action;
-	GtkActionGroup *action_group;
-	NemoWindowSlot *slot;
-	gboolean allowed;
-	GFile *parent;
-
-	slot = nemo_window_get_active_slot (window);
-
-	allowed = FALSE;
-	if (slot->location != NULL) {
-		parent = g_file_get_parent (slot->location);
-		allowed = parent != NULL;
-
-		g_clear_object (&parent);
-	}
-
-	action_group = nemo_window_get_main_action_group (window);
-
-	action = gtk_action_group_get_action (action_group,
-					      NEMO_ACTION_UP);
-	gtk_action_set_sensitive (action, allowed);
-	action = gtk_action_group_get_action (action_group,
-					      NEMO_ACTION_UP_ACCEL);
-	gtk_action_set_sensitive (action, allowed);
-}
-
 void
 nemo_window_sync_title (NemoWindow *window,
 			    NemoWindowSlot *slot)