summaryrefslogtreecommitdiff
path: root/src/nautilus-toolbar.c
diff options
context:
space:
mode:
authorNeil Herald <neil.herald@gmail.com>2016-05-21 20:12:22 +0100
committerNeil Herald <neil.herald@gmail.com>2016-06-22 23:38:23 +0100
commitd60524355532d92961b118ce2bc7df8e4e18f35e (patch)
tree9dd8970d54f4de40dd46be83b4846acc3969fdde /src/nautilus-toolbar.c
parent83ca885949386f6514ffc77c3a9c18189cfc6a6a (diff)
downloadnautilus-d60524355532d92961b118ce2bc7df8e4e18f35e.tar.gz
toolbar: move the new folder/tab/bookmark items into the shared popover
The files view creates and owns these buttons currently, meaning they aren't shown on the menu when the Other Locations view is active. This change moves the menu items from the view's toolbar menu ui file and into the ui file for the shared popover, so that the buttons are also shown for Other Locations. https://bugzilla.gnome.org/show_bug.cgi?id=764632
Diffstat (limited to 'src/nautilus-toolbar.c')
-rw-r--r--src/nautilus-toolbar.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c
index 63aa3ff8b..767254e4a 100644
--- a/src/nautilus-toolbar.c
+++ b/src/nautilus-toolbar.c
@@ -65,7 +65,6 @@ struct _NautilusToolbarPrivate {
guint operations_button_attention_timeout_id;
GtkWidget *operations_button;
- GtkWidget *view_button;
GtkWidget *view_menu_slot_section;
GtkWidget *view_toggle_button;
GtkWidget *view_toggle_icon;
@@ -889,7 +888,6 @@ nautilus_toolbar_class_init (NautilusToolbarClass *klass)
gtk_widget_class_bind_template_child_private (widget_class, NautilusToolbar, operations_popover);
gtk_widget_class_bind_template_child_private (widget_class, NautilusToolbar, operations_container);
gtk_widget_class_bind_template_child_private (widget_class, NautilusToolbar, operations_revealer);
- gtk_widget_class_bind_template_child_private (widget_class, NautilusToolbar, view_button);
gtk_widget_class_bind_template_child_private (widget_class, NautilusToolbar, view_menu_slot_section);
gtk_widget_class_bind_template_child_private (widget_class, NautilusToolbar, view_toggle_button);
gtk_widget_class_bind_template_child_private (widget_class, NautilusToolbar, view_toggle_icon);
@@ -972,7 +970,6 @@ on_slot_view_widget_changed (NautilusToolbar *toolbar,
g_list_free (children);
view_widget = nautilus_window_slot_get_view_widget (slot);
- gtk_widget_set_sensitive (toolbar->priv->view_button, view_widget != NULL);
if (view_widget == NULL)
return;