summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Soriano <csoriano@gnome.org>2016-03-30 22:30:34 +0200
committerCarlos Soriano <csoriano@gnome.org>2016-04-05 15:13:51 +0200
commitbd27a6205fa36250f7d8009d0c644bc9c2decfbc (patch)
tree9d530baa2050e5c057bbba9edfc21119592c3ab1
parent6382ea3de33cc5fe1068f0e0c13e7feeaa5cf940 (diff)
downloadnautilus-bd27a6205fa36250f7d8009d0c644bc9c2decfbc.tar.gz
window: use disable-chrome instead of desktop casting
We use disable-chrome all around to not show anything that comes from the chrome of the window. We can use it on all the cases, so we can avoid to special casing the desktop.
-rw-r--r--src/nautilus-window.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 45500ff0f..99a2d226b 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -30,7 +30,6 @@
#include <config.h>
#include "nautilus-application.h"
-#include "nautilus-desktop-window.h"
#include "nautilus-location-entry.h"
#include "nautilus-mime-actions.h"
#include "nautilus-notebook.h"
@@ -1649,7 +1648,7 @@ nautilus_window_on_undo_changed (NautilusFileUndoManager *manager,
if (undo_info != NULL &&
state == NAUTILUS_FILE_UNDO_MANAGER_STATE_UNDO &&
nautilus_file_undo_info_get_op_type (undo_info) == NAUTILUS_FILE_UNDO_OP_MOVE_TO_TRASH &&
- !NAUTILUS_IS_DESKTOP_WINDOW (window)) {
+ !window->priv->disable_chrome) {
files = nautilus_file_undo_info_trash_get_files (NAUTILUS_FILE_UNDO_INFO_TRASH (undo_info));
/* Don't pop up a notification if user canceled the operation or the focus
@@ -1718,7 +1717,7 @@ nautilus_window_show_operation_notification (NautilusWindow *window,
current_location = nautilus_window_slot_get_location (window->priv->active_slot);
if (gtk_window_has_toplevel_focus (GTK_WINDOW (window)) &&
- !NAUTILUS_IS_DESKTOP_WINDOW (window)) {
+ !window->priv->disable_chrome) {
remove_notifications (window);
gtk_label_set_text (GTK_LABEL (window->priv->notification_operation_label),
main_label);