summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Soriano <csoriano@gnome.org>2018-04-05 23:02:46 +0200
committerCarlos Soriano <csoriano@gnome.org>2018-04-09 11:56:20 +0200
commita7d35a292f5542cc6ba5296327a933f83e9cb5a0 (patch)
tree20a4c54a030f49c3e16efe3cf0732f580b952e33
parent9d83f0d979e51beb752eac75730d57ee82e66ecd (diff)
downloadnautilus-a7d35a292f5542cc6ba5296327a933f83e9cb5a0.tar.gz
move action bar to window
-rw-r--r--src/nautilus-window-slot.c23
1 files changed, 0 insertions, 23 deletions
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index 3b02f01b3..2943c5b4b 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -2773,20 +2773,8 @@ static void
change_view (NautilusWindowSlot *self)
{
NautilusWindowSlotPrivate *priv;
- NautilusView *view;
- gboolean view_changed;
priv = nautilus_window_slot_get_instance_private (self);
- view = priv->new_content_view;
- view_changed = priv->content_view != view;
-
- /* Remove the old actionbar before switching to the new view */
- if (view_changed &&
- priv->content_view &&
- nautilus_view_get_action_bar (priv->content_view))
- {
- gtk_container_remove (GTK_CONTAINER (self), nautilus_view_get_action_bar (priv->content_view));
- }
/* Switch to the new content view.
* Destroy the extra location widgets first, since they might hold
@@ -2806,17 +2794,6 @@ change_view (NautilusWindowSlot *self)
* add back the extra location widgets.
*/
nautilus_window_slot_setup_extra_location_widgets (self);
-
- /* Add the actionbar (if any) after the extra location widgets are set */
- if (view_changed && nautilus_view_get_action_bar (view))
- {
- GtkWidget *actionbar;
-
- actionbar = nautilus_view_get_action_bar (view);
-
- gtk_box_pack_end (GTK_BOX (self), actionbar, FALSE, FALSE, 0);
- gtk_widget_show (actionbar);
- }
}
static void