diff options
| author | Carlos Soriano <csoriano@gnome.org> | 2016-03-22 14:07:15 +0100 |
|---|---|---|
| committer | Carlos Soriano <csoriano@gnome.org> | 2016-04-05 15:13:51 +0200 |
| commit | f545aeafa49f4ffe27f95e2b0e8fc4f0b1516691 (patch) | |
| tree | b12e6a22d9e78a2440dbeee4a9b9a4001c9e4c06 | |
| parent | 9a0040a4da338acc09a6ac1afc572c28d09bf4c9 (diff) | |
| download | nautilus-f545aeafa49f4ffe27f95e2b0e8fc4f0b1516691.tar.gz | |
window-slot: remove unneeded code special casing desktop
We are special casing to open the desktop, so in case we try to
open the desktop in this window slot, and was already opened, we
were opening it again.
I cannot see a reason why we would need to open it anyway if was
already opened, and the test I did works fine.
So let's remove it for now, so we remove another special casing of the
desktop.
| -rw-r--r-- | src/nautilus-window-slot.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c index b96694205..d3583f8d1 100644 --- a/src/nautilus-window-slot.c +++ b/src/nautilus-window-slot.c @@ -817,19 +817,16 @@ nautilus_window_slot_open_location_full (NautilusWindowSlot *self, GFile *old_location; GList *old_selection; NautilusWindow *window; - gboolean is_desktop; priv = nautilus_window_slot_get_instance_private (self); old_selection = NULL; old_location = nautilus_window_slot_get_location (self); window = nautilus_window_slot_get_window (self); - is_desktop = NAUTILUS_IS_DESKTOP_CANVAS_VIEW (window); if (priv->content_view) { old_selection = nautilus_view_get_selection (priv->content_view); } - if (!is_desktop && - old_location && g_file_equal (old_location, location) && + if (old_location && g_file_equal (old_location, location) && nautilus_file_selection_equal (old_selection, new_selection)) goto done; |