diff options
author | Carlos Soriano <csoriano@gnome.org> | 2016-02-04 15:42:52 +0100 |
---|---|---|
committer | Carlos Soriano <csoriano@gnome.org> | 2016-02-04 15:45:41 +0100 |
commit | 3e9238db20285605904d9ae2846bbb37561f3693 (patch) | |
tree | d5861335466aeaf624e476f71c899cb1047161b6 | |
parent | f7f93e67bda2e6a08712aa332f8f2e40c2722d13 (diff) | |
download | nautilus-3e9238db20285605904d9ae2846bbb37561f3693.tar.gz |
toolbar: don't show operations popover in desktop
We needed a check there to not show it if the window is the desktop one.
Also this fixes the operations button not being hidden again due to
the desktop window popover being shown.
https://bugzilla.gnome.org/show_bug.cgi?id=761551
-rw-r--r-- | src/nautilus-toolbar.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c index 12c089923..189e4f5e2 100644 --- a/src/nautilus-toolbar.c +++ b/src/nautilus-toolbar.c @@ -31,6 +31,7 @@ #include "nautilus-window.h" #include "nautilus-progress-info-widget.h" #include "nautilus-application.h" +#include "nautilus-desktop-window.h" #include <libnautilus-private/nautilus-global-preferences.h> #include <libnautilus-private/nautilus-ui-utilities.h> @@ -601,8 +602,10 @@ update_operations (NautilusToolbar *self) gtk_widget_queue_draw (self->priv->operations_icon); /* Show the popover at start to increase visibility */ - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->priv->operations_button), - TRUE); + if (!NAUTILUS_IS_DESKTOP_WINDOW (self->priv->window)) { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->priv->operations_button), + TRUE); + } } } |