summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2012-11-05 19:00:50 -0500
committerCosimo Cecchi <cosimoc@gnome.org>2012-11-05 19:45:10 -0500
commitbbeb58d5760155b1311474190863c0bfd6c8fbc9 (patch)
tree06c9c96a8c6a452a68164bc56f21a4fde0c21947
parentfd746872e217b46faa8c4f12d1e524bd6fdacb68 (diff)
downloadnautilus-bbeb58d5760155b1311474190863c0bfd6c8fbc9.tar.gz
view: ensure Trash action is visible when setting sensitivity
We will set the visibility of the action to FALSE when we go to a location that supports deletion but not trashing, but we fail to restore it to TRUE when we go back to a directory that supports trashing. https://bugzilla.gnome.org/show_bug.cgi?id=687619
-rw-r--r--src/nautilus-view.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index e52ca8782..27d9adf83 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -8604,10 +8604,12 @@ real_update_menus (NautilusView *view)
NAUTILUS_ICON_DELETE : NAUTILUS_ICON_TRASH_FULL,
NULL);
/* if the backend supports delete but not trash then don't show trash */
- if (!can_trash_files && can_delete_files)
+ if (!can_trash_files && can_delete_files) {
gtk_action_set_visible (action, FALSE);
- else
+ } else {
+ gtk_action_set_visible (action, TRUE);
gtk_action_set_sensitive (action, can_trash_files);
+ }
action = gtk_action_group_get_action (view->details->dir_action_group,
NAUTILUS_ACTION_DELETE);