summaryrefslogtreecommitdiff
path: root/src/nautilus-window-slot.c
diff options
context:
space:
mode:
authorErnestas Kulik <ekulik@redhat.com>2018-11-17 10:22:04 +0100
committerErnestas Kulik <ekulik@redhat.com>2018-11-17 10:22:04 +0100
commit7d6586588295204e28ce1c84561fa94c21f1c53c (patch)
treefdf26cc53710154d3aba0c789cbaf70d65dc704a /src/nautilus-window-slot.c
parent9265d64e89acaa4353a54478cf0d4323fa190fdc (diff)
downloadnautilus-7d6586588295204e28ce1c84561fa94c21f1c53c.tar.gz
window-slot: Recreate trash bar for new files
Currently, the code only removes the bar when the trash monitor state changes to empty, but should also create it when files are freshly trashed. Fixes https://gitlab.gnome.org/GNOME/nautilus/issues/747
Diffstat (limited to 'src/nautilus-window-slot.c')
-rw-r--r--src/nautilus-window-slot.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index f221d0c8e..787bb5b7d 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -174,6 +174,7 @@ static GMenu* real_get_extensions_background_menu (NautilusWindowSlot *self);
static void real_set_templates_menu (NautilusWindowSlot *self,
GMenu *menu);
static GMenu* real_get_templates_menu (NautilusWindowSlot *self);
+static void nautilus_window_slot_setup_extra_location_widgets (NautilusWindowSlot *self);
void
nautilus_window_slot_restore_from_data (NautilusWindowSlot *self,
@@ -2699,10 +2700,16 @@ trash_state_changed_cb (NautilusTrashMonitor *monitor,
directory = nautilus_directory_get (location);
- if (nautilus_directory_is_in_trash (directory) &&
- nautilus_trash_monitor_is_empty ())
+ if (nautilus_directory_is_in_trash (directory))
{
- nautilus_window_slot_remove_extra_location_widgets (user_data);
+ if (nautilus_trash_monitor_is_empty ())
+ {
+ nautilus_window_slot_remove_extra_location_widgets (user_data);
+ }
+ else
+ {
+ nautilus_window_slot_setup_extra_location_widgets (user_data);
+ }
}
}