Merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-3-26-4 into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic

[Marco Trevisan (Treviño)]

  * New upstream release: 3.26.4 (LP: #1782681, LP: #1765776)
  * debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch,
    debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch,
    debian/patches/0018-search-engine-add-locate-based-search-engine.patch:
    - Follow nautilus settings to search only in current folder (LP: #1767027).
      This doesn't apply to gnome-shell search provider for indexed searches.
  * debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch:
    - Updated to respect upstream requested changes
  * debian/patches/nautilusgtkplacesview-show-error-if-volume-is-not-mounted.patch:
    - don't crash if selecting a volume that is not mounted (LP: #1764779)
  * debian/patches/Revert-Revert-files-view-Remove-new-empty-folder-name-sug.patch,
    debian/patches/Revert-Revert-nautilus-file-Don-t-show-thumbnails-for-the.patch:
    - Reverts the reverts introduced in 2.26.3.1 as they are in ubuntu already
  * debian/patches/clear_pending_selection.patch,
    debian/patches/git_middle_tab.patch,
    debian/patches/server_list_segfault.patch,
    debian/patches/nautilusgtkplacesview-show-error-if-volume-is-not-mounted.patch:
    - Patches removed as they are already applied upstream

[Amr Ibrahim (amribrahim1987)]

I just have a comment on what upstream did for 3.26.3.1. They reverted two commits, which they see as behavioural changes in a stable release, and that makes sense upstream.

Revert "files-view: Remove new empty folder name suggestion"
https://gitlab.gnome.org/GNOME/nautilus/commit/945c32dec747855047aa9b380d53588c5fcfb57a

Revert "nautilus-file: Don't show thumbnails for the first 2 zoom levels"
https://gitlab.gnome.org/GNOME/nautilus/commit/d62c0899f34665bdc4752ce8b6844328889f4638

But downstream here in Ubuntu, those behaviours were released as part of 18.04 in nautilus 3.26.3 and removing them might be considered a regression in Ubuntu itself. The changes had been introduced in 3.26.3 during the development cycle of Bionic, so technically that counts as an improvement, not as a behavioural change in stable Ubuntu.

[Marco Trevisan (Treviño) (3v1n0)]

Right Amr, I had the same feeling... So pushed a fix for both this and ubuntu/master

[Marco Trevisan (Treviño) (3v1n0)]

Pushed few more fixes, this should be now good for being sponsored (unless we don't also want the fix for LP: #1756826, which is on its way).

[Sebastien Bacher (seb128)]

thanks

review: Approve

diff --git a/NEWS b/NEWS
index 94f1bf4..2084b54 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+Major changes in 3.26.4
+* Fix tab lookup by coordinates in notebook (Ernestas Kulik)
+* Fix renaming of desktop files (Michael Murphy)
+* Fix crash on changes on recursive links (Ernestas Kulik, Ernestas Kulik)
+* Fix crash for non disconnected keybinding (Marco Trevisan)
+* Update Gtk-placesview code to fix crash (Marco Trevisan)
+* Avoid a11y related signals flooding on startup (Joanmarie Diggs)
+* Update flatpak generation for 3.26 (Carlos Soriano)
+* Fix Memory leaks (Rahul Verma, Wong Heung Sang)
+* Support dead_tilde key for location entry change (António Fernandes)
+* Fix middle-click for double-double-click mode (George Mocanu)
+* Updated Translations
+
+Major changes in 3.26.3.1:
+* Revert accidental backports of behavioral and visual changes
+
 Major changes in 3.26.3:
 * Don’t strip extension from folders in compress dialog (Rahul Verma)
 * Fix items not being focused when selected in list view (António Fernandes)
diff --git a/build-aux/flatpak/org.gnome.Nautilus-v3.26.json b/build-aux/flatpak/org.gnome.Nautilus-v3.26.json
 deleted file mode 100644
index 9cc8cef..0000000
--- a/build-aux/flatpak/org.gnome.Nautilus-v3.26.json
+++ /dev/null
@@ -1,113 +0,0 @@
-{
-    "app-id": "org.gnome.Nautilus",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "3.26",
-    "sdk": "org.gnome.Sdk",
-    "command": "nautilus",
-    "finish-args": [
-        "--share=ipc", "--socket=x11",
-        "--socket=wayland",
-        "--talk-name=org.gnome.OnlineAccounts",
-        "--talk-name=org.freedesktop.Tracker1",
-        "--filesystem=home",
-        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*",
-        "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro",
-        "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
-    ],
-    "build-options" : {
-        "cflags": "-Wno-deprecated-declarations -Og",
-        "cxxflags": "-Wno-deprecated-declarations -Og"
-    },
-    "cleanup": [ "/include", "/share/bash-completion" ],
-    "modules": [
-        {
-            "name": "libexif",
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://downloads.sourceforge.net/libexif/libexif-0.6.21.tar.bz2",
-                    "sha256": "16cdaeb62eb3e6dfab2435f7d7bccd2f37438d21c5218ec4e58efa9157d4d41a"
-                },
-                {
-                    "type": "shell",
-                    "commands": [
-                        "cp -f /usr/share/gnu-config/config.sub .",
-                        "cp -f /usr/share/gnu-config/config.guess ."
-                    ]
-                }
-            ]
-        },
-        {
-            "name": "exempi",
-            "config-opts": [
-                "--disable-unittest"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "branch": "tags/2.4.2",
-                    "commit": "bee83d2636bc875286c22ea092b7f7efb8c222d8",
-                    "url": "https://anongit.freedesktop.org/git/exempi.git"
-                }
-            ]
-
-        },
-        {
-            "name": "tracker",
-            "cleanup": [ "/bin", "/etc", "/libexec" ],
-            "config-opts": [ "--disable-miner-apps", "--disable-static",
-                             "--disable-tracker-extract", "--disable-tracker-needle",
-                             "--disable-tracker-preferences", "--disable-artwork",
-                             "--disable-tracker-writeback", "--disable-miner-user-guides",
-                             "--with-bash-completion-dir=no" ],
-            "sources": [
-                {
-                    "type": "git",
-                    "branch": "tracker-1.12",
-                    "url": "https://git.gnome.org/browse/tracker"
-                }
-            ]
-        },
-        {
-            "name": "gnome-desktop",
-            "config-opts": ["--disable-debug-tools", "--disable-udev"],
-            "sources": [
-                {
-                    "type": "git",
-                    "branch": "gnome-3-26",
-                    "url": "https://git.gnome.org/browse/gnome-desktop"
-                }
-            ]
-        },
-        {
-            "name": "gnome-autoar",
-            "sources": [
-                {
-                    "type": "git",
-                    "branch": "tags/0.2.2",
-                    "commit": "6d21fd1b90afb468423b78696f4f0f432033dba5",
-                    "url": "https://git.gnome.org/browse/gnome-autoar"
-                }
-            ]
-        },
-        {
-            "buildsystem": "meson",
-            "builddir": true,
-            "name": "nautilus",
-            "config-opts": [
-                "-Denable-desktop=false",
-                "-Denable-selinux=false",
-                "-Denable-xmp=true",
-                "-Denable-exif=true",
-                "--libdir=/app/lib"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "branch": "gnome-3-26",
-                    "url": "https://gitlab.gnome.org/GNOME/nautilus.git"
-                }
-            ]
-        }
-    ]
-}
diff --git a/build-aux/flatpak/org.gnome.Nautilus.json b/build-aux/flatpak/org.gnome.Nautilus.json
 new file mode 100644
index 0000000..3f44aeb
--- /dev/null
+++ b/build-aux/flatpak/org.gnome.Nautilus.json
@@ -0,0 +1,138 @@
+{
+    "app-id" : "org.gnome.Nautilus",
+    "runtime" : "org.gnome.Platform",
+    "runtime-version" : "3.26",
+    "sdk" : "org.gnome.Sdk",
+    "command" : "nautilus",
+    "tags" : [
+        "devel",
+        "development",
+        "nightly"
+    ],
+    "desktop-file-name-prefix" : "(Development) ",
+    "finish-args" : [
+        "--share=ipc",
+        "--socket=x11",
+        "--socket=wayland",
+        "--talk-name=org.gnome.OnlineAccounts",
+        "--talk-name=org.freedesktop.Tracker1",
+        "--filesystem=home",
+        "--talk-name=org.gtk.vfs",
+        "--talk-name=org.gtk.vfs.*",
+        "--filesystem=xdg-run/dconf",
+        "--filesystem=~/.config/dconf:ro",
+        "--talk-name=ca.desrt.dconf",
+        "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
+    ],
+    "build-options" : {
+        "cflags" : "-Wno-deprecated-declarations -Og",
+        "cxxflags" : "-Wno-deprecated-declarations -Og",
+        "env" : {
+        }
+    },
+    "cleanup" : [
+        "/include",
+        "/share/bash-completion"
+    ],
+    "modules" : [
+        {
+            "name" : "libexif",
+            "sources" : [
+                {
+                    "type" : "archive",
+                    "url" : "https://downloads.sourceforge.net/libexif/libexif-0.6.21.tar.bz2",
+                    "sha256" : "16cdaeb62eb3e6dfab2435f7d7bccd2f37438d21c5218ec4e58efa9157d4d41a"
+                },
+                {
+                    "type" : "shell",
+                    "commands" : [
+                        "cp -f /usr/share/gnu-config/config.sub .",
+                        "cp -f /usr/share/gnu-config/config.guess ."
+                    ]
+                }
+            ]
+        },
+        {
+            "name" : "exempi",
+            "config-opts" : [
+                "--disable-unittest"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://anongit.freedesktop.org/git/exempi.git",
+                    "tag" : "2.4.5"
+                }
+            ]
+        },
+        {
+            "name" : "tracker",
+            "cleanup" : [
+                "/bin",
+                "/etc",
+                "/libexec"
+            ],
+            "config-opts" : [
+                "--disable-miner-apps",
+                "--disable-static",
+                "--disable-tracker-extract",
+                "--disable-tracker-needle",
+                "--disable-tracker-preferences",
+                "--disable-artwork",
+                "--disable-tracker-writeback",
+                "--disable-miner-user-guides",
+                "--with-bash-completion-dir=no"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/tracker.git",
+                    "tag" : "2.0.3"
+                }
+            ]
+        },
+        {
+            "name" : "gnome-desktop",
+            "config-opts" : [
+                "--disable-debug-tools",
+                "--disable-udev"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/gnome-desktop.git",
+                    "tag" : "3.26.2"
+                }
+            ]
+        },
+        {
+            "name" : "gnome-autoar",
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/gnome-autoar.git",
+                    "tag" : "0.2.3"
+                }
+            ]
+        },
+        {
+            "buildsystem" : "meson",
+            "builddir" : true,
+            "name" : "nautilus",
+            "config-opts" : [
+                "-Denable-desktop=false",
+                "-Denable-selinux=false",
+                "-Denable-xmp=true",
+                "-Denable-exif=true",
+                "--libdir=/app/lib"
+            ],
+            "sources" : [
+                {
+                    "type" : "git",
+                    "url" : "https://gitlab.gnome.org/GNOME/nautilus.git",
+                    "branch" : "gnome-3-26"
+                }
+            ]
+        }
+    ]
+}
 \ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 30d5e5b..935ba5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+nautilus (1:3.26.4-0~ubuntu18.04.1) UNRELEASED; urgency=medium
+
+  * New upstream release: 3.26.4 (LP: #1782681, LP: #1765776)
+  * debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch,
+    debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch,
+    debian/patches/0018-search-engine-add-locate-based-search-engine.patch:
+    - Follow nautilus settings to search only in current folder (LP: #1767027).
+      This doesn't apply to gnome-shell search provider for indexed searches.
+  * debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch:
+    - Updated to respect upstream requested changes
+  * debian/patches/nautilusgtkplacesview-show-error-if-volume-is-not-mounted.patch:
+    - don't crash if selecting a volume that is not mounted (LP: #1764779)
+  * debian/patches/file-view-Always-unset-pending_selection-after-freeing-it.patch:
+    - don't crash when try to select a file multiple times in a single run
+      (LP: #1713581)
+  * debian/patches/Revert-Revert-files-view-Remove-new-empty-folder-name-sug.patch,
+    debian/patches/Revert-Revert-nautilus-file-Don-t-show-thumbnails-for-the.patch:
+    - Reverts the reverts introduced in 2.26.3.1 as they are in ubuntu already
+  * debian/patches/clear_pending_selection.patch,
+    debian/patches/git_middle_tab.patch,
+    debian/patches/server_list_segfault.patch:
+    - Patches removed as they are already applied upstream
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Fri, 20 Jul 2018 04:52:45 +0200
+
 nautilus (1:3.26.3-0ubuntu4) bionic; urgency=medium
 
   * debian/patches/server_list_segfault.patch,
diff --git a/debian/control.in b/debian/control.in
index 0d5ed26..19b2ec4 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -33,7 +33,10 @@ Build-Depends: debhelper (>= 10.3),
                libunity-dev (>= 5.0.0),
                libzeitgeist-2.0-dev,
 Homepage: https://wiki.gnome.org/action/show/Apps/Nautilus
-Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/nautilus/ubuntu
+XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/nautilus
+XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/nautilus.git
+Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/nautilus
+Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/nautilus -b ubuntu/bionic
 Standards-Version: 3.9.8
 
 Package: nautilus
diff --git a/debian/patches/0001-Respect-gtk-dialogs-use-header-for-all-dialogs.patch b/debian/patches/0001-Respect-gtk-dialogs-use-header-for-all-dialogs.patch
index 0eda334..35706df 100644
--- a/debian/patches/0001-Respect-gtk-dialogs-use-header-for-all-dialogs.patch
+++ b/debian/patches/0001-Respect-gtk-dialogs-use-header-for-all-dialogs.patch
@@ -1,4 +1,3 @@
-From d4cd0806f62422fd54e6a77f9c8767388bcb4200 Mon Sep 17 00:00:00 2001
 From: Iain Lane <[e-mail]>
 Date: Mon, 24 Nov 2014 10:43:18 +0000
 Subject: [PATCH 1/2] Respect gtk-dialogs-use-header for all dialogs
@@ -11,6 +10,17 @@ https://bugzilla.gnome.org/show_bug.cgi?id=740617
  src/nautilus-properties-window.c    |   28 ++++++++++++++++++++++++--
  src/nautilus-search-popover.c       |   18 ++++++++++++++++-
  6 files changed, 106 insertions(+), 9 deletions(-)
+---
+ src/meson.build                     |  1 +
+ src/nautilus-file-conflict-dialog.c | 10 +++++++++-
+ src/nautilus-files-view.c           | 38 +++++++++++++++++++++++++++++++++----
+ src/nautilus-list-view.c            | 20 ++++++++++++++++++-
+ src/nautilus-properties-window.c    | 28 +++++++++++++++++++++++++--
+ src/nautilus-search-popover.c       | 18 +++++++++++++++++-
+ 6 files changed, 106 insertions(+), 9 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 59703df..a771d12 100644
 --- a/src/meson.build
 +++ b/src/meson.build
 @@ -266,6 +266,7 @@ nautilus_deps = [glib,
@@ -21,6 +31,8 @@ https://bugzilla.gnome.org/show_bug.cgi?id=740617
                   gsettings_desktop_schemas,
                   libgd_dep,
                   gail,
+diff --git a/src/nautilus-file-conflict-dialog.c b/src/nautilus-file-conflict-dialog.c
+index fdcaf2d..1b9595d 100644
 --- a/src/nautilus-file-conflict-dialog.c
 +++ b/src/nautilus-file-conflict-dialog.c
 @@ -378,9 +378,17 @@ NautilusFileConflictDialog *
@@ -42,9 +54,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=740617
                                                            "modal", TRUE,
                                                            NULL));
  
+diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
+index 9b7b9b9..f916b05 100644
 --- a/src/nautilus-files-view.c
 +++ b/src/nautilus-files-view.c
-@@ -1414,16 +1414,30 @@ choose_program (NautilusFilesView *view,
+@@ -1442,16 +1442,30 @@ choose_program (NautilusFilesView *view,
      GtkWidget *dialog;
      g_autofree gchar *mime_type = NULL;
      GtkWindow *parent_window;
@@ -78,7 +92,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=740617
                                                            mime_type);
      g_object_set_data_full (G_OBJECT (dialog),
                              "directory-view:files",
-@@ -1628,10 +1642,26 @@ select_pattern (NautilusFilesView *view)
+@@ -1656,10 +1670,26 @@ select_pattern (NautilusFilesView *view)
      GtkWidget *grid;
      GtkWidget *entry;
      char *example_pattern;
@@ -106,9 +120,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=740617
                                            _("_Cancel"),
                                            GTK_RESPONSE_CANCEL,
                                            _("_Select"),
+diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
+index 2a0dfcd..e6b4693 100644
 --- a/src/nautilus-list-view.c
 +++ b/src/nautilus-list-view.c
-@@ -1105,6 +1105,8 @@ sort_column_changed_callback (GtkTreeSor
+@@ -1106,6 +1106,8 @@ sort_column_changed_callback (GtkTreeSortable  *sortable,
      char *reversed_attr, *default_reversed_attr;
      gboolean default_sort_reversed;
  
@@ -117,7 +133,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=740617
      file = nautilus_files_view_get_directory_as_file (NAUTILUS_FILES_VIEW (view));
  
      gtk_tree_sortable_get_sort_column_id (sortable, &sort_column_id, &reversed);
-@@ -3017,15 +3019,31 @@ create_column_editor (NautilusListView *
+@@ -3035,15 +3037,31 @@ create_column_editor (NautilusListView *view)
      char *str;
      char *name;
      const char *label_text;
@@ -150,9 +166,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=740617
                                            NULL, NULL);
      g_free (str);
      g_signal_connect (window, "response",
+diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
+index d9ccd22..d354780 100644
 --- a/src/nautilus-properties-window.c
 +++ b/src/nautilus-properties-window.c
-@@ -4570,10 +4570,26 @@ on_change_permissions_clicked (GtkWidget
+@@ -4570,10 +4570,26 @@ on_change_permissions_clicked (GtkWidget                *button,
      GtkWidget *label;
      GtkWidget *combo;
      GtkGrid *grid;
@@ -180,7 +198,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=740617
                                            _("_Cancel"), GTK_RESPONSE_CANCEL,
                                            _("Change"), GTK_RESPONSE_OK,
                                            NULL);
-@@ -4994,9 +5010,17 @@ create_properties_window (StartupData *s
+@@ -4994,9 +5010,17 @@ create_properties_window (StartupData *startup_data)
  {
      NautilusPropertiesWindow *window;
      GList *l;
@@ -199,9 +217,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=740617
                                                           "type-hint", GDK_WINDOW_TYPE_HINT_DIALOG,
                                                           "modal", TRUE,
                                                           NULL));
+diff --git a/src/nautilus-search-popover.c b/src/nautilus-search-popover.c
+index 2401363..52bee08 100644
 --- a/src/nautilus-search-popover.c
 +++ b/src/nautilus-search-popover.c
-@@ -539,6 +539,22 @@ show_other_types_dialog (NautilusSearchP
+@@ -547,6 +547,22 @@ show_other_types_dialog (NautilusSearchPopover *popover)
      GtkCellRenderer *renderer;
      GtkWidget *toplevel;
      GtkTreeSelection *selection;
@@ -224,7 +244,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=740617
  
      mime_infos = g_content_types_get_registered ();
  
-@@ -569,7 +585,7 @@ show_other_types_dialog (NautilusSearchP
+@@ -577,7 +593,7 @@ show_other_types_dialog (NautilusSearchPopover *popover)
      toplevel = gtk_widget_get_toplevel (GTK_WIDGET (popover));
      dialog = gtk_dialog_new_with_buttons (_("Select type"),
                                            GTK_WINDOW (toplevel),
diff --git a/debian/patches/0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch b/debian/patches/0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch
index 4fd9909..4cc55ed 100644
--- a/debian/patches/0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch
+++ b/debian/patches/0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch
@@ -7,7 +7,7 @@ Subject: tracker-search-engine: don't start it if not available on system
  1 file changed, 20 insertions(+), 4 deletions(-)
 
 diff --git a/src/nautilus-search-engine-tracker.c b/src/nautilus-search-engine-tracker.c
-index 4c917dd..8218ea3 100644
+index 8885ca4..050716d 100644
 --- a/src/nautilus-search-engine-tracker.c
 +++ b/src/nautilus-search-engine-tracker.c
 @@ -42,6 +42,7 @@ struct _NautilusSearchEngineTracker
@@ -18,7 +18,7 @@ index 4c917dd..8218ea3 100644
      gboolean recursive;
      gboolean fts_enabled;
  
-@@ -305,8 +306,15 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider)
+@@ -304,8 +305,15 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider)
          return;
      }
  
@@ -35,16 +35,16 @@ index 4c917dd..8218ea3 100644
      tracker->query_pending = TRUE;
  
      g_object_notify (G_OBJECT (provider), "running");
-@@ -472,6 +480,9 @@ nautilus_search_engine_tracker_set_query (NautilusSearchProvider *provider,
+@@ -471,6 +479,9 @@ nautilus_search_engine_tracker_set_query (NautilusSearchProvider *provider,
  
-     tracker = NAUTILUS_SEARCH_ENGINE_TRACKER (provider);
+     g_clear_object (&tracker->query);
  
 +    if (!tracker->available)
 +        return;
 +
-     g_object_ref (query);
-     g_clear_object (&tracker->query);
-     tracker->query = query;
+     tracker->query = g_object_ref (query);
+     tracker->recursive = is_recursive_search (NAUTILUS_SEARCH_ENGINE_TYPE_INDEXED,
+                                               nautilus_query_get_recursive (query),
 @@ -539,16 +550,21 @@ static void
  nautilus_search_engine_tracker_init (NautilusSearchEngineTracker *engine)
  {
diff --git a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch b/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch
index 1a4ee1c..f80997f 100644
--- a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch
+++ b/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch
@@ -1,25 +1,34 @@
 From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
 Date: Wed, 21 Feb 2018 17:05:51 +0100
 Subject: search-engine: add a recent-search-engine listing GtkRecentManager
- stuff
+ entries
 
-Using GtkRecent items as search engine source in nautilus
+Using GtkRecent items as search engine source in nautilus.
+The main reason for this, is being able to get fast results on recently-used
+files from the shell search provider.
+
+This is disabled when recursive searches are disabled, as there's no need to go
+through for recent files if no recursive (or indexed) search is enabled as the
+simple engine will be already fast enough, while running this engine could be
+just a waste.
+
+Origin: upstream
+Applied-Upstream: https://gitlab.gnome.org/GNOME/nautilus/commit/69686372fd6e6
 ---
  src/meson.build                     |   2 +
- src/nautilus-file.h                 |   1 +
- src/nautilus-search-engine-recent.c | 385 ++++++++++++++++++++++++++++++++++++
- src/nautilus-search-engine-recent.h |  36 ++++
- src/nautilus-search-engine.c        |  11 ++
- 5 files changed, 435 insertions(+)
+ src/nautilus-search-engine-recent.c | 427 ++++++++++++++++++++++++++++++++++++
+ src/nautilus-search-engine-recent.h |  36 +++
+ src/nautilus-search-engine.c        |  11 +
+ 4 files changed, 476 insertions(+)
  create mode 100644 src/nautilus-search-engine-recent.c
  create mode 100644 src/nautilus-search-engine-recent.h
 
 diff --git a/src/meson.build b/src/meson.build
-index a771d12..0ea9165 100644
+index 73aafe9..213b35f 100644
 --- a/src/meson.build
 +++ b/src/meson.build
-@@ -228,6 +228,8 @@ libnautilus_sources = [
-     'nautilus-search-engine.h',
+@@ -229,6 +229,8 @@ libnautilus_sources = [
+     'nautilus-search-engine-private.h',
      'nautilus-search-engine-model.c',
      'nautilus-search-engine-model.h',
 +    'nautilus-search-engine-recent.c',
@@ -27,24 +36,12 @@ index a771d12..0ea9165 100644
      'nautilus-search-engine-simple.c',
      'nautilus-search-engine-simple.h',
      'nautilus-search-hit.c',
-diff --git a/src/nautilus-file.h b/src/nautilus-file.h
-index 3a83bd4..fd72d7a 100644
---- a/src/nautilus-file.h
-+++ b/src/nautilus-file.h
-@@ -49,6 +49,7 @@ typedef struct NautilusFile NautilusFile;
-   (G_TYPE_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_FILE))
- #define NAUTILUS_FILE_GET_CLASS(obj) \
-   (G_TYPE_INSTANCE_GET_CLASS ((obj), NAUTILUS_TYPE_FILE, NautilusFileClass))
-+G_DEFINE_AUTOPTR_CLEANUP_FUNC (NautilusFile, g_object_unref)
- 
- typedef enum {
- 	NAUTILUS_FILE_SORT_NONE,
 diff --git a/src/nautilus-search-engine-recent.c b/src/nautilus-search-engine-recent.c
 new file mode 100644
-index 0000000..f052e8f
+index 0000000..bbd0d82
 --- /dev/null
 +++ b/src/nautilus-search-engine-recent.c
-@@ -0,0 +1,385 @@
+@@ -0,0 +1,427 @@
 +/*
 + * Copyright (C) 2018 Canonical Ltd
 + *
@@ -69,6 +66,7 @@ index 0000000..f052e8f
 +#include "nautilus-search-hit.h"
 +#include "nautilus-search-provider.h"
 +#include "nautilus-search-engine-recent.h"
++#include "nautilus-search-engine-private.h"
 +#include "nautilus-ui-utilities.h"
 +#define DEBUG_FLAG NAUTILUS_DEBUG_SEARCH
 +#include "nautilus-debug.h"
@@ -161,6 +159,51 @@ index 0000000..f052e8f
 +    return FALSE;
 +}
 +
++static gboolean
++is_file_valid_recursive (NautilusSearchEngineRecent *self,
++                         GFile                      *file,
++                         GError                    **error)
++{
++    g_autofree gchar *path = NULL;
++    g_autoptr (GFileInfo) file_info = NULL;
++
++    file_info = g_file_query_info (file, FILE_ATTRIBS,
++                                   G_FILE_QUERY_INFO_NONE,
++                                   self->cancellable, error);
++    if (*error != NULL)
++    {
++        return FALSE;
++    }
++
++    if (!g_file_info_get_attribute_boolean (file_info,
++                                            G_FILE_ATTRIBUTE_ACCESS_CAN_READ))
++    {
++        return FALSE;
++    }
++
++    path = g_file_get_path (file);
++
++    if (!nautilus_query_get_show_hidden_files (self->query))
++    {
++        if (!g_file_info_get_is_hidden (file_info) &&
++            !g_file_info_get_is_backup (file_info))
++        {
++            g_autoptr (GFile) parent = g_file_get_parent (file);
++
++            if (parent)
++            {
++                return is_file_valid_recursive (self, parent, error);
++            }
++        }
++        else
++        {
++            return FALSE;
++        }
++    }
++
++    return TRUE;
++}
++
 +static gpointer
 +recent_thread_func (gpointer user_data)
 +{
@@ -199,44 +242,24 @@ index 0000000..f052e8f
 +
 +        if (gtk_recent_info_is_local (info))
 +        {
-+            g_autofree gchar *path = NULL;
-+            g_autoptr (GFileInfo) file_info = NULL;
 +            g_autoptr (GError) error = NULL;
 +
-+            file_info = g_file_query_info (file, FILE_ATTRIBS,
-+                                           G_FILE_QUERY_INFO_NONE,
-+                                           self->cancellable, &error);
-+            if (error != NULL)
++            if (!is_file_valid_recursive (self, file, &error))
 +            {
 +                if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
 +                {
 +                    break;
 +                }
 +
-+                if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS))
++                if (error != NULL &&
++                    !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS))
 +                {
-+                    g_debug("Impossible to read locate file info: %s",
++                    g_debug("Impossible to read recent file info: %s",
 +                            error->message);
 +                }
 +
 +                continue;
 +            }
-+
-+            if (!g_file_info_get_attribute_boolean (file_info,
-+                                                    G_FILE_ATTRIBUTE_ACCESS_CAN_READ))
-+            {
-+                continue;
-+            }
-+
-+            path = g_file_get_path (file);
-+
-+            if (!nautilus_query_get_show_hidden_files (self->query) &&
-+                (g_file_info_get_is_hidden (file_info) ||
-+                 g_file_info_get_is_backup (file_info) ||
-+                 g_strrstr (path, G_DIR_SEPARATOR_S ".") != NULL))
-+            {
-+                continue;
-+            }
 +        }
 +
 +        if (g_cancellable_is_cancelled (self->cancellable))
@@ -333,6 +356,7 @@ index 0000000..f052e8f
 +nautilus_search_engine_recent_start (NautilusSearchProvider *provider)
 +{
 +    NautilusSearchEngineRecent *self = NAUTILUS_SEARCH_ENGINE_RECENT (provider);
++    g_autoptr (GFile) location = NULL;
 +    GThread *thread;
 +
 +    g_return_if_fail (self->query);
@@ -340,6 +364,21 @@ index 0000000..f052e8f
 +
 +    g_object_ref (self);
 +    g_object_ref (self->query);
++
++    location = nautilus_query_get_location (self->query);
++
++    if (!is_recursive_search (NAUTILUS_SEARCH_ENGINE_TYPE_INDEXED,
++                              nautilus_query_get_recursive (self->query),
++                              location))
++    {
++        SearchHitsData *search_hits;
++        search_hits = g_new0 (SearchHitsData, 1);
++        search_hits->recent = self;
++
++        g_idle_add (search_thread_add_hits_idle, search_hits);
++        return;
++    }
++
 +    self->cancellable = g_cancellable_new ();
 +
 +    thread = g_thread_new ("nautilus-search-recent", recent_thread_func, self);
@@ -473,18 +512,16 @@ index 0000000..bcd73b9
 +
 +#endif /* __NAUTILUS_SEARCH_ENGINE_RECENT_H__ */
 diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c
-index 209bd4f..aef91b7 100644
+index 3a0c9d4..793b831 100644
 --- a/src/nautilus-search-engine.c
 +++ b/src/nautilus-search-engine.c
-@@ -24,6 +24,7 @@
- #include <glib/gi18n.h>
- #include "nautilus-search-provider.h"
- #include "nautilus-search-engine.h"
-+#include "nautilus-search-engine-recent.h"
- #include "nautilus-search-engine-simple.h"
- #include "nautilus-search-engine-model.h"
+@@ -30,11 +30,13 @@
  #define DEBUG_FLAG NAUTILUS_DEBUG_SEARCH
-@@ -33,6 +34,7 @@
+ #include "nautilus-debug.h"
+ #include "nautilus-search-engine-simple.h"
++#include "nautilus-search-engine-recent.h"
+ #include "nautilus-search-engine-tracker.h"
+ 
  typedef struct
  {
      NautilusSearchEngineTracker *tracker;
@@ -492,7 +529,7 @@ index 209bd4f..aef91b7 100644
      NautilusSearchEngineSimple *simple;
      NautilusSearchEngineModel *model;
  
-@@ -74,6 +76,7 @@ nautilus_search_engine_set_query (NautilusSearchProvider *provider,
+@@ -76,6 +78,7 @@ nautilus_search_engine_set_query (NautilusSearchProvider *provider,
      priv = nautilus_search_engine_get_instance_private (engine);
  
      nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (priv->tracker), query);
@@ -500,7 +537,7 @@ index 209bd4f..aef91b7 100644
      nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (priv->model), query);
      nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (priv->simple), query);
  }
-@@ -98,6 +101,9 @@ search_engine_start_real (NautilusSearchEngine *engine)
+@@ -100,6 +103,9 @@ search_engine_start_real (NautilusSearchEngine *engine)
      nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (priv->tracker));
      priv->providers_running++;
  
@@ -510,7 +547,7 @@ index 209bd4f..aef91b7 100644
      if (nautilus_search_engine_model_get_model (priv->model))
      {
          nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (priv->model));
-@@ -159,6 +165,7 @@ nautilus_search_engine_stop (NautilusSearchProvider *provider)
+@@ -161,6 +167,7 @@ nautilus_search_engine_stop (NautilusSearchProvider *provider)
      DEBUG ("Search engine stop");
  
      nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (priv->tracker));
@@ -518,7 +555,7 @@ index 209bd4f..aef91b7 100644
      nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (priv->model));
      nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (priv->simple));
  
-@@ -334,6 +341,7 @@ nautilus_search_engine_finalize (GObject *object)
+@@ -336,6 +343,7 @@ nautilus_search_engine_finalize (GObject *object)
      g_hash_table_destroy (priv->uris);
  
      g_clear_object (&priv->tracker);
@@ -526,7 +563,7 @@ index 209bd4f..aef91b7 100644
      g_clear_object (&priv->model);
      g_clear_object (&priv->simple);
  
-@@ -395,6 +403,9 @@ nautilus_search_engine_init (NautilusSearchEngine *engine)
+@@ -397,6 +405,9 @@ nautilus_search_engine_init (NautilusSearchEngine *engine)
  
      priv->simple = nautilus_search_engine_simple_new ();
      connect_provider_signals (engine, NAUTILUS_SEARCH_PROVIDER (priv->simple));
diff --git a/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch b/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch
index 99abe37..e6185da 100644
--- a/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch
+++ b/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch
@@ -1,5 +1,5 @@
 From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
-Date: Wed, 11 Apr 2018 18:51:34 -0400
+Date: Thu, 12 Apr 2018 00:51:34 +0200
 Subject: recent: add function to update manager on file rename or move
 
 When files have been moved or renamed nautilus should inform
@@ -7,13 +7,13 @@ recent manager about this change for the files that
 are listed there.
 ---
  src/nautilus-directory.c |   8 +++
- src/nautilus-file.c      |  25 +++++-----
- src/nautilus-recent.c    | 126 +++++++++++++++++++++++++++++++++++++++++++++++
+ src/nautilus-file.c      |  25 +++++----
+ src/nautilus-recent.c    | 132 +++++++++++++++++++++++++++++++++++++++++++++++
  src/nautilus-recent.h    |   8 ++-
- 4 files changed, 152 insertions(+), 15 deletions(-)
+ 4 files changed, 158 insertions(+), 15 deletions(-)
 
 diff --git a/src/nautilus-directory.c b/src/nautilus-directory.c
-index ad3bb03..f1a3bf8 100644
+index 19316e8..9bb5460 100644
 --- a/src/nautilus-directory.c
 +++ b/src/nautilus-directory.c
 @@ -33,6 +33,7 @@
@@ -24,7 +24,7 @@ index ad3bb03..f1a3bf8 100644
  #include "nautilus-vfs-directory.h"
  #include <eel/eel-glib-extensions.h>
  #include <eel/eel-string.h>
-@@ -1546,9 +1547,14 @@ nautilus_directory_notify_files_moved (GList *file_pairs)
+@@ -1560,9 +1561,14 @@ nautilus_directory_notify_files_moved (GList *file_pairs)
  
      for (p = file_pairs; p != NULL; p = p->next)
      {
@@ -39,7 +39,7 @@ index ad3bb03..f1a3bf8 100644
  
          /* Handle overwriting a file. */
          file = nautilus_file_get_existing (to_location);
-@@ -1626,6 +1632,8 @@ nautilus_directory_notify_files_moved (GList *file_pairs)
+@@ -1645,6 +1651,8 @@ nautilus_directory_notify_files_moved (GList *file_pairs)
              /* Unref each file once to balance out nautilus_file_get_by_uri. */
              unref_list = g_list_prepend (unref_list, file);
          }
@@ -49,7 +49,7 @@ index ad3bb03..f1a3bf8 100644
  
      /* Now send out the changed and added signals for existing file objects. */
 diff --git a/src/nautilus-file.c b/src/nautilus-file.c
-index 2135801..15e5d05 100644
+index 63413a6..9416214 100644
 --- a/src/nautilus-file.c
 +++ b/src/nautilus-file.c
 @@ -34,6 +34,7 @@
@@ -60,7 +60,7 @@ index 2135801..15e5d05 100644
  #include "nautilus-thumbnails.h"
  #include "nautilus-ui-utilities.h"
  #include "nautilus-video-mime-types.h"
-@@ -1952,14 +1953,12 @@ rename_get_info_callback (GObject      *source_object,
+@@ -1960,14 +1961,12 @@ rename_get_info_callback (GObject      *source_object,
                            GAsyncResult *res,
                            gpointer      callback_data)
  {
@@ -77,7 +77,7 @@ index 2135801..15e5d05 100644
  
      op = callback_data;
  
-@@ -1967,8 +1966,12 @@ rename_get_info_callback (GObject      *source_object,
+@@ -1975,8 +1974,12 @@ rename_get_info_callback (GObject      *source_object,
      new_info = g_file_query_info_finish (G_FILE (source_object), res, &error);
      if (new_info != NULL)
      {
@@ -91,7 +91,7 @@ index 2135801..15e5d05 100644
          new_name = g_file_info_get_name (new_info);
  
          /* If there was another file by the same name in this
-@@ -1983,6 +1986,7 @@ rename_get_info_callback (GObject      *source_object,
+@@ -1991,6 +1994,7 @@ rename_get_info_callback (GObject      *source_object,
          }
  
          old_uri = nautilus_file_get_uri (op->file);
@@ -99,7 +99,7 @@ index 2135801..15e5d05 100644
  
          update_info_and_name (op->file, new_info);
  
-@@ -2010,9 +2014,10 @@ rename_get_info_callback (GObject      *source_object,
+@@ -2018,9 +2022,10 @@ rename_get_info_callback (GObject      *source_object,
          g_object_unref (subject);
          g_free (origin);
  
@@ -112,7 +112,7 @@ index 2135801..15e5d05 100644
  
          /* the rename could have affected the display name if e.g.
           * we're in a vfolder where the name comes from a desktop file
-@@ -2024,14 +2029,8 @@ rename_get_info_callback (GObject      *source_object,
+@@ -2032,14 +2037,8 @@ rename_get_info_callback (GObject      *source_object,
                                                   NAUTILUS_FILE_ATTRIBUTE_INFO |
                                                   NAUTILUS_FILE_ATTRIBUTE_LINK_INFO);
          }
@@ -128,17 +128,18 @@ index 2135801..15e5d05 100644
  
  static void
 diff --git a/src/nautilus-recent.c b/src/nautilus-recent.c
-index ab50fef..c69a3a7 100644
+index ab50fef..6676465 100644
 --- a/src/nautilus-recent.c
 +++ b/src/nautilus-recent.c
-@@ -1,5 +1,6 @@
+@@ -1,5 +1,7 @@
  /*
   * Copyright (C) 2002 James Willcox
 + * Copyright (C) 2018 Canonical Ltd
++ * Copyright (C) 2018 Marco Trevisan
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
-@@ -17,6 +18,7 @@
+@@ -17,6 +19,7 @@
  
  #include "config.h"
  #include "nautilus-recent.h"
@@ -146,16 +147,16 @@ index ab50fef..c69a3a7 100644
  
  #include <eel/eel-vfs-extensions.h>
  
-@@ -85,3 +87,127 @@ nautilus_recent_add_file (NautilusFile *file,
+@@ -85,3 +88,132 @@ nautilus_recent_add_file (NautilusFile *file,
  
      g_free (uri);
  }
 +
 +void
-+nautilus_recent_update_file_moved (const gchar   *old_uri,
-+                                   const gchar   *new_uri,
-+                                   const gchar   *old_display_name,
-+                                   const gchar   *new_display_name)
++nautilus_recent_update_file_moved (const gchar *old_uri,
++                                   const gchar *new_uri,
++                                   const gchar *old_display_name,
++                                   const gchar *new_display_name)
 +{
 +    GtkRecentManager *recent_manager = nautilus_recent_get_manager ();
 +    g_autoptr (NautilusFile) file = NULL;
@@ -191,9 +192,11 @@ index ab50fef..c69a3a7 100644
 +
 +    if (nautilus_file_is_directory (file))
 +    {
++        g_autoptr (GFile) location = NULL;
 +        GList *recent_items;
 +        GList *l;
 +
++        location = g_file_new_for_uri (old_uri);
 +        recent_items = gtk_recent_manager_get_items (recent_manager);
 +
 +        for (l = recent_items; l; l = l->next)
@@ -203,9 +206,12 @@ index ab50fef..c69a3a7 100644
 +
 +            if (g_str_has_prefix (item_uri, old_uri))
 +            {
-+                const gchar *relative_path = item_uri + strlen (old_uri);
++                g_autoptr (GFile) item_file = NULL;
++                g_autofree gchar *relative_path = NULL;
 +                g_autofree gchar *new_item_uri = NULL;
 +
++                item_file = g_file_new_for_uri (item_uri);
++                relative_path = g_file_get_relative_path (location, item_file);
 +                new_item_uri = g_build_filename (new_uri, relative_path, NULL);
 +
 +                gtk_recent_manager_move_item (recent_manager,
diff --git a/debian/patches/0018-search-engine-add-locate-based-search-engine.patch b/debian/patches/0018-search-engine-add-locate-based-search-engine.patch
index 5140963..91a7ec0 100644
--- a/debian/patches/0018-search-engine-add-locate-based-search-engine.patch
+++ b/debian/patches/0018-search-engine-add-locate-based-search-engine.patch
@@ -7,19 +7,19 @@ command line and parsing output to provide more and
 quicker results to the shell and nautilus
 ---
  src/meson.build                     |   2 +
- src/nautilus-search-engine-locate.c | 597 ++++++++++++++++++++++++++++++++++++
+ src/nautilus-search-engine-locate.c | 601 ++++++++++++++++++++++++++++++++++++
  src/nautilus-search-engine-locate.h |  37 +++
  src/nautilus-search-engine.c        |  11 +
- 4 files changed, 647 insertions(+)
+ 4 files changed, 651 insertions(+)
  create mode 100644 src/nautilus-search-engine-locate.c
  create mode 100644 src/nautilus-search-engine-locate.h
 
 diff --git a/src/meson.build b/src/meson.build
-index 0ea9165..06e6633 100644
+index 213b35f..a0bf109 100644
 --- a/src/meson.build
 +++ b/src/meson.build
-@@ -228,6 +228,8 @@ libnautilus_sources = [
-     'nautilus-search-engine.h',
+@@ -229,6 +229,8 @@ libnautilus_sources = [
+     'nautilus-search-engine-private.h',
      'nautilus-search-engine-model.c',
      'nautilus-search-engine-model.h',
 +    'nautilus-search-engine-locate.c',
@@ -29,10 +29,10 @@ index 0ea9165..06e6633 100644
      'nautilus-search-engine-simple.c',
 diff --git a/src/nautilus-search-engine-locate.c b/src/nautilus-search-engine-locate.c
 new file mode 100644
-index 0000000..16f9f21
+index 0000000..d152a23
 --- /dev/null
 +++ b/src/nautilus-search-engine-locate.c
-@@ -0,0 +1,597 @@
+@@ -0,0 +1,601 @@
 +/*
 + * Copyright (C) 2018 Canonical Ltd
 + *
@@ -57,6 +57,7 @@ index 0000000..16f9f21
 +#include "nautilus-search-hit.h"
 +#include "nautilus-search-provider.h"
 +#include "nautilus-search-engine-locate.h"
++#include "nautilus-search-engine-private.h"
 +#include "nautilus-ui-utilities.h"
 +#define DEBUG_FLAG NAUTILUS_DEBUG_SEARCH
 +#include "nautilus-debug.h"
@@ -452,7 +453,12 @@ index 0000000..16f9f21
 +    sdata = g_new0 (LocateSearchData, 1);
 +    sdata->locate = g_object_ref (self);
 +
-+    if (!(self->locate_features & LOCATE_INSTALLED))
++    query_location = nautilus_query_get_location (self->query);
++
++    if (!(self->locate_features & LOCATE_INSTALLED) ||
++        !is_recursive_search (NAUTILUS_SEARCH_ENGINE_TYPE_INDEXED,
++                              nautilus_query_get_recursive (self->query),
++                              query_location))
 +    {
 +        g_idle_add ((GSourceFunc) submit_results, sdata);
 +        return;
@@ -493,8 +499,6 @@ index 0000000..16f9f21
 +        return;
 +    }
 +
-+    query_location = nautilus_query_get_location (self->query);
-+
 +    sdata->query = g_object_ref (self->query);
 +    sdata->date_range = nautilus_query_get_date_range (self->query);
 +    sdata->mime_types = nautilus_query_get_mime_types (self->query);
@@ -674,18 +678,18 @@ index 0000000..ac5e3fc
 +
 +#endif /* __NAUTILUS_SEARCH_ENGINE_LOCATE_H__ */
 diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c
-index aef91b7..bf0e85d 100644
+index 793b831..902d483 100644
 --- a/src/nautilus-search-engine.c
 +++ b/src/nautilus-search-engine.c
-@@ -25,6 +25,7 @@
- #include "nautilus-search-provider.h"
- #include "nautilus-search-engine.h"
- #include "nautilus-search-engine-recent.h"
+@@ -29,6 +29,7 @@
+ #include <glib/gi18n.h>
+ #define DEBUG_FLAG NAUTILUS_DEBUG_SEARCH
+ #include "nautilus-debug.h"
 +#include "nautilus-search-engine-locate.h"
  #include "nautilus-search-engine-simple.h"
- #include "nautilus-search-engine-model.h"
- #define DEBUG_FLAG NAUTILUS_DEBUG_SEARCH
-@@ -35,6 +36,7 @@ typedef struct
+ #include "nautilus-search-engine-recent.h"
+ #include "nautilus-search-engine-tracker.h"
+@@ -37,6 +38,7 @@ typedef struct
  {
      NautilusSearchEngineTracker *tracker;
      NautilusSearchEngineRecent *recent;
@@ -693,7 +697,7 @@ index aef91b7..bf0e85d 100644
      NautilusSearchEngineSimple *simple;
      NautilusSearchEngineModel *model;
  
-@@ -77,6 +79,7 @@ nautilus_search_engine_set_query (NautilusSearchProvider *provider,
+@@ -79,6 +81,7 @@ nautilus_search_engine_set_query (NautilusSearchProvider *provider,
  
      nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (priv->tracker), query);
      nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (priv->recent), query);
@@ -701,7 +705,7 @@ index aef91b7..bf0e85d 100644
      nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (priv->model), query);
      nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (priv->simple), query);
  }
-@@ -104,6 +107,9 @@ search_engine_start_real (NautilusSearchEngine *engine)
+@@ -106,6 +109,9 @@ search_engine_start_real (NautilusSearchEngine *engine)
      priv->providers_running++;
      nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (priv->recent));
  
@@ -711,7 +715,7 @@ index aef91b7..bf0e85d 100644
      if (nautilus_search_engine_model_get_model (priv->model))
      {
          nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (priv->model));
-@@ -166,6 +172,7 @@ nautilus_search_engine_stop (NautilusSearchProvider *provider)
+@@ -168,6 +174,7 @@ nautilus_search_engine_stop (NautilusSearchProvider *provider)
  
      nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (priv->tracker));
      nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (priv->recent));
@@ -719,7 +723,7 @@ index aef91b7..bf0e85d 100644
      nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (priv->model));
      nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (priv->simple));
  
-@@ -342,6 +349,7 @@ nautilus_search_engine_finalize (GObject *object)
+@@ -344,6 +351,7 @@ nautilus_search_engine_finalize (GObject *object)
  
      g_clear_object (&priv->tracker);
      g_clear_object (&priv->recent);
@@ -727,7 +731,7 @@ index aef91b7..bf0e85d 100644
      g_clear_object (&priv->model);
      g_clear_object (&priv->simple);
  
-@@ -406,6 +414,9 @@ nautilus_search_engine_init (NautilusSearchEngine *engine)
+@@ -408,6 +416,9 @@ nautilus_search_engine_init (NautilusSearchEngine *engine)
  
      priv->recent = nautilus_search_engine_recent_new ();
      connect_provider_signals (engine, NAUTILUS_SEARCH_PROVIDER (priv->recent));
diff --git a/debian/patches/03_translations_list_update.patch b/debian/patches/03_translations_list_update.patch
index bd2e0fd..7fc36f0 100644
--- a/debian/patches/03_translations_list_update.patch
+++ b/debian/patches/03_translations_list_update.patch
@@ -1,10 +1,16 @@
+From: Ubuntu Developers <[e-mail]>
+Date: Fri, 20 Jul 2018 03:25:37 +0200
+Subject: _translations_list_update
+
 ---
- po/POTFILES.in |    2 ++
+ po/POTFILES.in | 2 ++
  1 file changed, 2 insertions(+)
 
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index 277a7ff..2960c09 100644
 --- a/po/POTFILES.in
 +++ b/po/POTFILES.in
-@@ -4,6 +4,8 @@ data/nautilus-autorun-software.desktop.i
+@@ -4,6 +4,8 @@ data/nautilus-autorun-software.desktop.in
  data/org.gnome.Nautilus.appdata.xml.in
  data/org.gnome.Nautilus.desktop.in
  data/org.gnome.nautilus.gschema.xml
diff --git a/debian/patches/04_suppress_umount_in_ltsp.patch b/debian/patches/04_suppress_umount_in_ltsp.patch
index bff103d..2bba6bb 100644
--- a/debian/patches/04_suppress_umount_in_ltsp.patch
+++ b/debian/patches/04_suppress_umount_in_ltsp.patch
@@ -1,4 +1,3 @@
-From 81825762ca8f8535f04f8e4ee273d443657ad121 Mon Sep 17 00:00:00 2001
 From: Jeremy Bicha <[e-mail]>
 Date: Thu, 27 Apr 2017 20:30:13 -0400
 Subject: file: Don't offer to eject or unmount LTSP volumes
@@ -11,10 +10,10 @@ Bug-Ubuntu: https://launchpad.net/bugs/220564
  1 file changed, 10 insertions(+)
 
 diff --git a/src/nautilus-file.c b/src/nautilus-file.c
-index e7e96dc86..89748973f 100644
+index adbf081..3a7c9a4 100644
 --- a/src/nautilus-file.c
 +++ b/src/nautilus-file.c
-@@ -1116,6 +1116,11 @@ nautilus_file_can_unmount (NautilusFile *file)
+@@ -1128,6 +1128,11 @@ nautilus_file_can_unmount (NautilusFile *file)
  {
      g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE);
  
@@ -26,7 +25,7 @@ index e7e96dc86..89748973f 100644
      return file->details->can_unmount ||
             (file->details->mount != NULL &&
              g_mount_can_unmount (file->details->mount));
-@@ -1126,6 +1131,11 @@ nautilus_file_can_eject (NautilusFile *file)
+@@ -1138,6 +1143,11 @@ nautilus_file_can_eject (NautilusFile *file)
  {
      g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE);
  
diff --git a/debian/patches/06_never_exec_nonexec_launchers.patch b/debian/patches/06_never_exec_nonexec_launchers.patch
index c1733b5..5aedf36 100644
--- a/debian/patches/06_never_exec_nonexec_launchers.patch
+++ b/debian/patches/06_never_exec_nonexec_launchers.patch
@@ -1,4 +1,3 @@
-From 75a0e1c62203ef362437ce4fdf1fc93ec5cf147c Mon Sep 17 00:00:00 2001
 From: Jeremy Bicha <[e-mail]>
 Date: Sun, 30 Apr 2017 21:28:31 -0400
 Subject: [PATCH] Require executable permission for launchers in home dir
@@ -10,10 +9,10 @@ https://wiki.ubuntu.com/SecurityTeam/Policies#Execute-Permission_Bit_Required
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/nautilus-mime-actions.c b/src/nautilus-mime-actions.c
-index 14fe44bc3..0c6364986 100644
+index 8827160..894f0ea 100644
 --- a/src/nautilus-mime-actions.c
 +++ b/src/nautilus-mime-actions.c
-@@ -1606,7 +1606,7 @@ activate_desktop_file (ActivateParameters *parameters,
+@@ -1513,7 +1513,7 @@ activate_desktop_file (ActivateParameters *parameters,
                                 _("_Cancel"), GTK_RESPONSE_CANCEL);
  
          gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
diff --git a/debian/patches/12_unity_launcher_support.patch b/debian/patches/12_unity_launcher_support.patch
index 2d9f54d..180934e 100644
--- a/debian/patches/12_unity_launcher_support.patch
+++ b/debian/patches/12_unity_launcher_support.patch
@@ -32,7 +32,7 @@ index 4f5cb58..9ddb88d 100644
  #mesondefine ENABLE_PACKAGEKIT
  #mesondefine LOCALEDIR
 diff --git a/meson.build b/meson.build
-index 18e645a..495101f 100644
+index 0b8a6f1..4d2acf2 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -30,6 +30,8 @@ exempi_ver = '>=2.1.0'
@@ -94,7 +94,7 @@ index cc08345..59703df 100644
      nautilus_deps += exempi
  endif
 diff --git a/src/nautilus-application.c b/src/nautilus-application.c
-index 98e6f35..ae19115 100644
+index 3ccbf54..b62cfab 100644
 --- a/src/nautilus-application.c
 +++ b/src/nautilus-application.c
 @@ -54,6 +54,10 @@
diff --git a/debian/patches/18_unity_icon_color.patch b/debian/patches/18_unity_icon_color.patch
index b476d5a..0956765 100644
--- a/debian/patches/18_unity_icon_color.patch
+++ b/debian/patches/18_unity_icon_color.patch
@@ -1,12 +1,17 @@
-Description: specify a background color for the unity launcher icon
+From: Ubuntu Developers <[e-mail]>
+Date: Fri, 20 Jul 2018 03:25:37 +0200
+Subject: specify a background color for the unity launcher icon
+
 Bug: https://launchpad.net/bugs/1081691
 ---
- data/org.gnome.Nautilus.desktop.in |    1 +
+ data/org.gnome.Nautilus.desktop.in | 1 +
  1 file changed, 1 insertion(+)
 
+diff --git a/data/org.gnome.Nautilus.desktop.in b/data/org.gnome.Nautilus.desktop.in
+index b7be676..ad67456 100644
 --- a/data/org.gnome.Nautilus.desktop.in
 +++ b/data/org.gnome.Nautilus.desktop.in
-@@ -14,6 +14,7 @@ Categories=GNOME;GTK;Utility;Core;FileMa
+@@ -14,6 +14,7 @@ Categories=GNOME;GTK;Utility;Core;FileManager;
  MimeType=inode/directory;application/x-7z-compressed;application/x-7z-compressed-tar;application/x-bzip;application/x-bzip-compressed-tar;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-gzip;application/x-lha;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-tar;application/x-tarz;application/x-xar;application/x-xz;application/x-xz-compressed-tar;application/zip;application/gzip;application/bzip2;
  X-GNOME-UsesNotifications=true
  Actions=new-window;
diff --git a/debian/patches/19_unity_open_location_xid.patch b/debian/patches/19_unity_open_location_xid.patch
index 57403d0..bc37956 100644
--- a/debian/patches/19_unity_open_location_xid.patch
+++ b/debian/patches/19_unity_open_location_xid.patch
@@ -1,19 +1,22 @@
-Description: Add a new dbus property to the nautilus'
- "org.freedesktop.FileManager1" dbus interface where it stores the lists of
- opened locations referenced by their parent nautilus window XID.
+From: Ubuntu Developers <[e-mail]>
+Date: Fri, 20 Jul 2018 03:25:37 +0200
+Subject: Add a new dbus property to the nautilus'
 
+"org.freedesktop.FileManager1" dbus interface where it stores the lists of
+opened locations referenced by their parent nautilus window XID.
 Bug-Ubuntu: https://bugs.launchpad.net/unity/+bug/887449
 Forwarded: no
 Author: Marco Trevisan <[e-mail]>
-
 ---
- data/freedesktop-dbus-interfaces.xml |    1 
- src/nautilus-application.c           |   78 ++++++++++++++++++++++++++++++++---
- src/nautilus-application.h           |    2 
- src/nautilus-freedesktop-dbus.c      |   21 ++++++++-
- src/nautilus-freedesktop-dbus.h      |    1 
+ data/freedesktop-dbus-interfaces.xml |  1 +
+ src/nautilus-application.c           | 78 +++++++++++++++++++++++++++++++++---
+ src/nautilus-application.h           |  2 +
+ src/nautilus-freedesktop-dbus.c      | 21 +++++++++-
+ src/nautilus-freedesktop-dbus.h      |  1 +
  5 files changed, 96 insertions(+), 7 deletions(-)
 
+diff --git a/data/freedesktop-dbus-interfaces.xml b/data/freedesktop-dbus-interfaces.xml
+index da37ca0..8d12720 100644
 --- a/data/freedesktop-dbus-interfaces.xml
 +++ b/data/freedesktop-dbus-interfaces.xml
 @@ -31,5 +31,6 @@
@@ -23,9 +26,11 @@ Author: Marco Trevisan <[e-mail]>
 +    <property name="XUbuntuOpenLocationsXids" type="a{uas}" access="read"/>
    </interface>
  </node>
+diff --git a/src/nautilus-application.c b/src/nautilus-application.c
+index b62cfab..1ec0d22 100644
 --- a/src/nautilus-application.c
 +++ b/src/nautilus-application.c
-@@ -1338,8 +1338,8 @@ nautilus_application_dbus_unregister (GA
+@@ -1358,8 +1358,8 @@ nautilus_application_dbus_unregister (GApplication    *app,
      }
  }
  
@@ -36,7 +41,7 @@ Author: Marco Trevisan <[e-mail]>
  {
      NautilusApplicationPrivate *priv;
      gint i;
-@@ -1352,6 +1352,11 @@ update_dbus_opened_locations (NautilusAp
+@@ -1372,6 +1372,11 @@ update_dbus_opened_locations (NautilusApplication *self)
  
      g_return_if_fail (NAUTILUS_IS_APPLICATION (self));
  
@@ -48,7 +53,7 @@ Author: Marco Trevisan <[e-mail]>
      priv = nautilus_application_get_instance_private (self);
  
      /* Children of nautilus application could not handle the dbus, so don't
-@@ -1365,6 +1370,22 @@ update_dbus_opened_locations (NautilusAp
+@@ -1385,6 +1390,22 @@ update_dbus_opened_locations (NautilusApplication *self)
      {
          window = l->data;
  
@@ -71,7 +76,7 @@ Author: Marco Trevisan <[e-mail]>
          for (sl = nautilus_window_get_slots (window); sl; sl = sl->next)
          {
              NautilusWindowSlot *slot = sl->data;
-@@ -1373,6 +1394,12 @@ update_dbus_opened_locations (NautilusAp
+@@ -1393,6 +1414,12 @@ update_dbus_opened_locations (NautilusApplication *self)
              if (location != NULL)
              {
                  gchar *uri = g_file_get_uri (location);
@@ -84,7 +89,7 @@ Author: Marco Trevisan <[e-mail]>
                  GList *found = g_list_find_custom (locations, uri, (GCompareFunc) g_strcmp0);
  
                  if (!found)
-@@ -1386,6 +1413,26 @@ update_dbus_opened_locations (NautilusAp
+@@ -1406,6 +1433,26 @@ update_dbus_opened_locations (NautilusApplication *self)
                  }
              }
          }
@@ -111,7 +116,7 @@ Author: Marco Trevisan <[e-mail]>
      }
  
      locations_array = g_new (gchar *, locations_size + 1);
-@@ -1401,6 +1448,9 @@ update_dbus_opened_locations (NautilusAp
+@@ -1421,6 +1468,9 @@ update_dbus_opened_locations (NautilusApplication *self)
      nautilus_freedesktop_dbus_set_open_locations (priv->fdb_manager,
                                                    (const gchar **) locations_array);
  
@@ -121,7 +126,7 @@ Author: Marco Trevisan <[e-mail]>
      g_free (locations_array);
      g_list_free_full (locations, g_free);
  }
-@@ -1410,7 +1460,14 @@ on_slot_location_changed (NautilusWindow
+@@ -1430,7 +1480,14 @@ on_slot_location_changed (NautilusWindowSlot  *slot,
                            GParamSpec          *pspec,
                            NautilusApplication *self)
  {
@@ -137,7 +142,7 @@ Author: Marco Trevisan <[e-mail]>
  }
  
  static void
-@@ -1420,7 +1477,7 @@ on_slot_added (NautilusWindow      *wind
+@@ -1440,7 +1497,7 @@ on_slot_added (NautilusWindow      *window,
  {
      if (nautilus_window_slot_get_location (slot))
      {
@@ -146,17 +151,17 @@ Author: Marco Trevisan <[e-mail]>
      }
  
      g_signal_connect (slot, "notify::location", G_CALLBACK (on_slot_location_changed), self);
-@@ -1431,9 +1488,16 @@ on_slot_removed (NautilusWindow      *wi
+@@ -1451,9 +1508,16 @@ on_slot_removed (NautilusWindow      *window,
                   NautilusWindowSlot  *slot,
                   NautilusApplication *self)
  {
 -    update_dbus_opened_locations (self);
 +    nautilus_application_update_dbus_opened_locations (self);
-+
-+    g_signal_handlers_disconnect_by_func (slot, on_slot_active_changed, self);
-+}
  
 -    g_signal_handlers_disconnect_by_func (slot, on_slot_location_changed, self);
++    g_signal_handlers_disconnect_by_func (slot, on_slot_active_changed, self);
++}
++
 +static void
 +on_realize (GtkWidget           *widget,
 +            NautilusApplication *self)
@@ -165,7 +170,7 @@ Author: Marco Trevisan <[e-mail]>
  }
  
  static void
-@@ -1449,6 +1513,7 @@ nautilus_application_window_added (GtkAp
+@@ -1469,6 +1533,7 @@ nautilus_application_window_added (GtkApplication *app,
      if (NAUTILUS_IS_WINDOW (window))
      {
          priv->windows = g_list_prepend (priv->windows, window);
@@ -173,7 +178,7 @@ Author: Marco Trevisan <[e-mail]>
          g_signal_connect (window, "slot-added", G_CALLBACK (on_slot_added), app);
          g_signal_connect (window, "slot-removed", G_CALLBACK (on_slot_removed), app);
      }
-@@ -1468,6 +1533,7 @@ nautilus_application_window_removed (Gtk
+@@ -1488,6 +1553,7 @@ nautilus_application_window_removed (GtkApplication *app,
      if (NAUTILUS_IS_WINDOW (window))
      {
          priv->windows = g_list_remove_all (priv->windows, window);
@@ -181,9 +186,11 @@ Author: Marco Trevisan <[e-mail]>
          g_signal_handlers_disconnect_by_func (window, on_slot_added, app);
          g_signal_handlers_disconnect_by_func (window, on_slot_removed, app);
      }
+diff --git a/src/nautilus-application.h b/src/nautilus-application.h
+index 197a276..9cb32c8 100644
 --- a/src/nautilus-application.h
 +++ b/src/nautilus-application.h
-@@ -89,6 +89,8 @@ void nautilus_application_search (Nautil
+@@ -89,6 +89,8 @@ void nautilus_application_search (NautilusApplication *application,
                                    const gchar         *uri,
                                    const gchar         *text);
  void nautilus_application_startup_common (NautilusApplication *application);
@@ -192,6 +199,8 @@ Author: Marco Trevisan <[e-mail]>
  G_END_DECLS
  
  #endif /* __NAUTILUS_APPLICATION_H__ */
+diff --git a/src/nautilus-freedesktop-dbus.c b/src/nautilus-freedesktop-dbus.c
+index c4657ab..601e0c9 100644
 --- a/src/nautilus-freedesktop-dbus.c
 +++ b/src/nautilus-freedesktop-dbus.c
 @@ -160,6 +160,9 @@ bus_acquired_cb (GDBusConnection *conn,
@@ -204,7 +213,7 @@ Author: Marco Trevisan <[e-mail]>
  }
  
  static void
-@@ -226,7 +229,23 @@ nautilus_freedesktop_dbus_set_open_locat
+@@ -226,7 +229,23 @@ nautilus_freedesktop_dbus_set_open_locations (NautilusFreedesktopDBus  *fdb,
  {
      g_return_if_fail (NAUTILUS_IS_FREEDESKTOP_DBUS (fdb));
  
@@ -229,9 +238,11 @@ Author: Marco Trevisan <[e-mail]>
  }
  
  /* Tries to own the org.freedesktop.FileManager1 service name */
+diff --git a/src/nautilus-freedesktop-dbus.h b/src/nautilus-freedesktop-dbus.h
+index 410c420..e277e55 100644
 --- a/src/nautilus-freedesktop-dbus.h
 +++ b/src/nautilus-freedesktop-dbus.h
-@@ -47,5 +47,6 @@ GType nautilus_freedesktop_dbus_get_type
+@@ -47,5 +47,6 @@ GType nautilus_freedesktop_dbus_get_type (void);
  NautilusFreedesktopDBus * nautilus_freedesktop_dbus_new (void);
  
  void nautilus_freedesktop_dbus_set_open_locations (NautilusFreedesktopDBus *fdb, const gchar **locations);
diff --git a/debian/patches/20_add_timestamp_to_operations.patch b/debian/patches/20_add_timestamp_to_operations.patch
index 9cbfbc3..f1203e5 100644
--- a/debian/patches/20_add_timestamp_to_operations.patch
+++ b/debian/patches/20_add_timestamp_to_operations.patch
@@ -1,6 +1,8 @@
-Description: Add *WithTimestamp dbus methods for file operations that
-  might trigger a dialog, that should be presented with event time.
+From: Ubuntu Developers <[e-mail]>
+Date: Fri, 20 Jul 2018 03:25:37 +0200
+Subject: Add *WithTimestamp dbus methods for file operations that
 
+ might trigger a dialog, that should be presented with event time.
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1445595
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=758833
 Forwarded: yes
@@ -9,16 +11,15 @@ From 13b0e898fbc80230333bb53dfffaa26a32889279 Mon Sep 17 00:00:00 2001
 From: Tim Lunn <[e-mail]>
 Date: Sat, 20 Feb 2016 08:26:51 +1100
 Subject: [PATCH] 20_timestamp
-
----
-
 ---
- data/dbus-interfaces.xml       |   15 ++++++
- src/nautilus-dbus-manager.c    |   97 +++++++++++++++++++++++++++++++++++------
- src/nautilus-file-operations.c |   52 +++++++++++++++++++++
- src/nautilus-file-operations.h |   17 +++++++
+ data/dbus-interfaces.xml       | 15 +++++++
+ src/nautilus-dbus-manager.c    | 97 ++++++++++++++++++++++++++++++++++++------
+ src/nautilus-file-operations.c | 52 ++++++++++++++++++++++
+ src/nautilus-file-operations.h | 17 ++++++++
  4 files changed, 167 insertions(+), 14 deletions(-)
 
+diff --git a/data/dbus-interfaces.xml b/data/dbus-interfaces.xml
+index 35fb994..c1b2cab 100644
 --- a/data/dbus-interfaces.xml
 +++ b/data/dbus-interfaces.xml
 @@ -27,13 +27,28 @@
@@ -50,9 +51,11 @@ Subject: [PATCH] 20_timestamp
 +    </method>
    </interface>
  </node>
+diff --git a/src/nautilus-dbus-manager.c b/src/nautilus-dbus-manager.c
+index 77d00d6..b6dc4e1 100644
 --- a/src/nautilus-dbus-manager.c
 +++ b/src/nautilus-dbus-manager.c
-@@ -60,13 +60,13 @@ nautilus_dbus_manager_dispose (GObject *
+@@ -60,13 +60,13 @@ nautilus_dbus_manager_dispose (GObject *object)
      G_OBJECT_CLASS (nautilus_dbus_manager_parent_class)->dispose (object);
  }
  
@@ -73,7 +76,7 @@ Subject: [PATCH] 20_timestamp
  {
      GFile *source_file, *target_dir;
      const gchar *target_name = NULL, *source_name = NULL;
-@@ -89,16 +89,41 @@ handle_copy_file (NautilusDBusFileOperat
+@@ -89,16 +89,41 @@ handle_copy_file (NautilusDBusFileOperations *object,
  
      g_object_unref (source_file);
      g_object_unref (target_dir);
@@ -119,7 +122,7 @@ Subject: [PATCH] 20_timestamp
  {
      GList *source_files = NULL;
      GFile *dest_dir;
-@@ -112,18 +137,39 @@ handle_copy_uris (NautilusDBusFileOperat
+@@ -112,17 +137,38 @@ handle_copy_uris (NautilusDBusFileOperations  *object,
                                         g_file_new_for_uri (sources[idx]));
      }
  
@@ -146,7 +149,7 @@ Subject: [PATCH] 20_timestamp
      return TRUE; /* invocation was handled */
  }
  
- static gboolean
++static gboolean
 +handle_copy_uris_with_timestamp (NautilusDBusFileOperations *object,
 +                                 GDBusMethodInvocation *invocation,
 +                                 const gchar **sources,
@@ -158,11 +161,10 @@ Subject: [PATCH] 20_timestamp
 +    return TRUE;
 +}
 +
-+static gboolean
+ static gboolean
  handle_empty_trash (NautilusDBusFileOperations *object,
                      GDBusMethodInvocation      *invocation)
- {
-@@ -133,6 +179,17 @@ handle_empty_trash (NautilusDBusFileOper
+@@ -133,6 +179,17 @@ handle_empty_trash (NautilusDBusFileOperations *object,
      return TRUE; /* invocation was handled */
  }
  
@@ -180,7 +182,7 @@ Subject: [PATCH] 20_timestamp
  static void
  nautilus_dbus_manager_init (NautilusDBusManager *self)
  {
-@@ -150,6 +207,18 @@ nautilus_dbus_manager_init (NautilusDBus
+@@ -150,6 +207,18 @@ nautilus_dbus_manager_init (NautilusDBusManager *self)
                        "handle-empty-trash",
                        G_CALLBACK (handle_empty_trash),
                        self);
@@ -199,6 +201,8 @@ Subject: [PATCH] 20_timestamp
  }
  
  static void
+diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c
+index 546acf8..c641ec5 100644
 --- a/src/nautilus-file-operations.c
 +++ b/src/nautilus-file-operations.c
 @@ -69,6 +69,7 @@ typedef struct
@@ -209,7 +213,7 @@ Subject: [PATCH] 20_timestamp
      NautilusProgressInfo *progress;
      GCancellable *cancellable;
      GHashTable *skip_files;
-@@ -1167,6 +1168,7 @@ typedef struct
+@@ -1172,6 +1173,7 @@ typedef struct
      const char *details_text;
      const char **button_titles;
      gboolean show_all;
@@ -217,7 +221,7 @@ Subject: [PATCH] 20_timestamp
      int result;
      /* Dialogs are ran from operation threads, which need to be blocked until
       * the user gives a valid response
-@@ -1227,6 +1229,7 @@ do_run_simple_dialog (gpointer _data)
+@@ -1232,6 +1234,7 @@ do_run_simple_dialog (gpointer _data)
      }
  
      /* Run it. */
@@ -225,7 +229,7 @@ Subject: [PATCH] 20_timestamp
      result = gtk_dialog_run (GTK_DIALOG (dialog));
  
      while ((result == GTK_RESPONSE_NONE || result == GTK_RESPONSE_DELETE_EVENT) && data->ignore_close_box)
-@@ -1273,6 +1276,7 @@ run_simple_dialog_va (CommonJob      *jo
+@@ -1278,6 +1281,7 @@ run_simple_dialog_va (CommonJob      *job,
      data->secondary_text = secondary_text;
      data->details_text = details_text;
      data->show_all = show_all;
@@ -233,10 +237,11 @@ Subject: [PATCH] 20_timestamp
      data->completed = FALSE;
      g_mutex_init (&data->mutex);
      g_cond_init (&data->cond);
-@@ -5862,6 +5866,26 @@ nautilus_file_operations_copy_file (GFil
+@@ -5779,6 +5783,26 @@ nautilus_file_operations_copy_file (GFile                *source_file,
+                                     GtkWindow            *parent_window,
                                      NautilusCopyCallback  done_callback,
                                      gpointer              done_callback_data)
- {
++{
 +    nautilus_file_operations_copy_file_with_time (source_file,
 +                                                  target_dir,
 +                                                  source_display_name,
@@ -256,11 +261,10 @@ Subject: [PATCH] 20_timestamp
 +                                              guint32 timestamp,
 +                                              NautilusCopyCallback done_callback,
 +                                              gpointer done_callback_data)
-+{
+ {
      GTask *task;
      CopyMoveJob *job;
- 
-@@ -5875,6 +5899,7 @@ nautilus_file_operations_copy_file (GFil
+@@ -5793,6 +5817,7 @@ nautilus_file_operations_copy_file (GFile                *source_file,
      nautilus_progress_info_set_destination (((CommonJob *) job)->progress, target_dir);
      job->target_name = g_strdup (new_name);
      job->debuting_files = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal, g_object_unref, NULL);
@@ -268,10 +272,11 @@ Subject: [PATCH] 20_timestamp
  
      if (source_display_name != NULL)
      {
-@@ -5902,6 +5927,24 @@ nautilus_file_operations_copy (GList
+@@ -5819,6 +5844,24 @@ nautilus_file_operations_copy (GList                *files,
+                                GtkWindow            *parent_window,
                                 NautilusCopyCallback  done_callback,
                                 gpointer              done_callback_data)
- {
++{
 +    nautilus_file_operations_copy_with_time (files,
 +                                             relative_item_points,
 +                                             target_dir,
@@ -289,11 +294,10 @@ Subject: [PATCH] 20_timestamp
 +                                         guint32               timestamp,
 +                                         NautilusCopyCallback  done_callback,
 +                                         gpointer              done_callback_data)
-+{
+ {
      GTask *task;
      CopyMoveJob *job;
- 
-@@ -5911,6 +5954,7 @@ nautilus_file_operations_copy (GList
+@@ -5829,6 +5872,7 @@ nautilus_file_operations_copy (GList                *files,
      job->done_callback_data = done_callback_data;
      job->files = g_list_copy_deep (files, (GCopyFunc) g_object_ref, NULL);
      job->destination = g_object_ref (target_dir);
@@ -301,21 +305,21 @@ Subject: [PATCH] 20_timestamp
      /* Need to indicate the destination for the operation notification open
       * button. */
      nautilus_progress_info_set_destination (((CommonJob *) job)->progress, target_dir);
-@@ -7934,6 +7978,13 @@ empty_trash_thread_func (GTask        *t
+@@ -7886,6 +7930,13 @@ empty_trash_thread_func (GTask        *task,
+ 
  void
  nautilus_file_operations_empty_trash (GtkWidget *parent_view)
- {
++{
 +    nautilus_file_operations_empty_trash_with_time (parent_view, GDK_CURRENT_TIME);
 +}
 +
 +void
 +nautilus_file_operations_empty_trash_with_time (GtkWidget *parent_view,
 +                                                guint32    timestamp)
-+{
+ {
      g_autoptr (GTask) task = NULL;
      EmptyTrashJob *job;
-     GtkWindow *parent_window;
-@@ -7948,6 +7999,7 @@ nautilus_file_operations_empty_trash (Gt
+@@ -7901,6 +7952,7 @@ nautilus_file_operations_empty_trash (GtkWidget *parent_view)
      job->trash_dirs = g_list_prepend (job->trash_dirs,
                                        g_file_new_for_uri ("trash:"));
      job->should_confirm = TRUE;
@@ -323,9 +327,11 @@ Subject: [PATCH] 20_timestamp
  
      inhibit_power_manager ((CommonJob *) job, _("Emptying Trash"));
  
+diff --git a/src/nautilus-file-operations.h b/src/nautilus-file-operations.h
+index a479ee6..321fbc6 100644
 --- a/src/nautilus-file-operations.h
 +++ b/src/nautilus-file-operations.h
-@@ -65,7 +65,17 @@ void nautilus_file_operations_copy_file
+@@ -65,7 +65,17 @@ void nautilus_file_operations_copy_file (GFile *source_file,
  					 GtkWindow *parent_window,
  					 NautilusCopyCallback done_callback,
  					 gpointer done_callback_data);
@@ -343,7 +349,7 @@ Subject: [PATCH] 20_timestamp
  void nautilus_file_operations_new_folder  (GtkWidget                 *parent_view,
  					   GdkPoint                  *target_point,
  					   const char                *parent_dir_uri,
-@@ -129,6 +139,13 @@ void nautilus_file_operations_copy
+@@ -129,6 +139,13 @@ void nautilus_file_operations_copy      (GList                *files,
  					 GtkWindow            *parent_window,
  					 NautilusCopyCallback  done_callback,
  					 gpointer              done_callback_data);
diff --git a/debian/patches/Revert-Revert-files-view-Remove-new-empty-folder-name-sug.patch b/debian/patches/Revert-Revert-files-view-Remove-new-empty-folder-name-sug.patch
 new file mode 100644
index 0000000..d7c9a12
--- /dev/null
+++ b/debian/patches/Revert-Revert-files-view-Remove-new-empty-folder-name-sug.patch
@@ -0,0 +1,53 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Wed, 18 Jul 2018 18:46:28 +0200
+Subject: Revert "Revert "files-view: Remove new empty folder name
+ suggestion""
+
+This reverts commit 945c32dec747855047aa9b380d53588c5fcfb57a.
+
+This feature was already provided in Ubuntu, so would be a regression if we drop it
+---
+ src/nautilus-files-view.c | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
+index 8784f63..9b7b9b9 100644
+--- a/src/nautilus-files-view.c
++++ b/src/nautilus-files-view.c
+@@ -2047,9 +2047,8 @@ static void
+ nautilus_files_view_new_folder_dialog_new (NautilusFilesView *view,
+                                            gboolean           with_selection)
+ {
+-    NautilusDirectory *containing_directory;
++    g_autoptr (NautilusDirectory) containing_directory = NULL;
+     NautilusFilesViewPrivate *priv;
+-    GList *selection;
+     g_autofree char *uri = NULL;
+     g_autofree char *common_prefix = NULL;
+ 
+@@ -2063,8 +2062,13 @@ nautilus_files_view_new_folder_dialog_new (NautilusFilesView *view,
+     uri = nautilus_files_view_get_backing_uri (view);
+     containing_directory = nautilus_directory_get_by_uri (uri);
+ 
+-    selection = nautilus_view_get_selection (NAUTILUS_VIEW (view));
+-    common_prefix = nautilus_get_common_filename_prefix (selection, MIN_COMMON_FILENAME_PREFIX_LENGTH);
++    if (with_selection)
++    {
++        GList *selection;
++        selection = nautilus_view_get_selection (NAUTILUS_VIEW (view));
++        common_prefix = nautilus_get_common_filename_prefix (selection, MIN_COMMON_FILENAME_PREFIX_LENGTH);
++        nautilus_file_list_free (selection);
++    }
+ 
+     priv->new_folder_controller =
+         nautilus_new_folder_dialog_controller_new (nautilus_files_view_get_containing_window (view),
+@@ -2080,9 +2084,6 @@ nautilus_files_view_new_folder_dialog_new (NautilusFilesView *view,
+                       "cancelled",
+                       (GCallback) new_folder_dialog_controller_on_cancelled,
+                       view);
+-
+-    nautilus_file_list_free (selection);
+-    nautilus_directory_unref (containing_directory);
+ }
+ 
+ typedef struct
diff --git a/debian/patches/Revert-Revert-nautilus-file-Don-t-show-thumbnails-for-the.patch b/debian/patches/Revert-Revert-nautilus-file-Don-t-show-thumbnails-for-the.patch
 new file mode 100644
index 0000000..8f4fa62
--- /dev/null
+++ b/debian/patches/Revert-Revert-nautilus-file-Don-t-show-thumbnails-for-the.patch
@@ -0,0 +1,25 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Wed, 18 Jul 2018 18:46:16 +0200
+Subject: Revert "Revert "nautilus-file: Don't show thumbnails for the first 2
+ zoom levels""
+
+This reverts commit d62c0899f34665bdc4752ce8b6844328889f4638.
+
+This feature was already provided in Ubuntu, so would be a regression if we drop it
+---
+ src/nautilus-file.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/nautilus-file.c b/src/nautilus-file.c
+index 0ac5398..adbf081 100644
+--- a/src/nautilus-file.c
++++ b/src/nautilus-file.c
+@@ -5511,7 +5511,7 @@ nautilus_thumbnail_is_limited_by_zoom (int size,
+ 
+     zoom_level = size * scale;
+ 
+-    if (zoom_level <= NAUTILUS_LIST_ICON_SIZE_SMALL)
++    if (zoom_level <= NAUTILUS_LIST_ICON_SIZE_STANDARD)
+     {
+         return TRUE;
+     }
diff --git a/debian/patches/appstream-compulsory.patch b/debian/patches/appstream-compulsory.patch
index 4260814..19c6d0b 100644
--- a/debian/patches/appstream-compulsory.patch
+++ b/debian/patches/appstream-compulsory.patch
@@ -1,5 +1,5 @@
 From: Jeremy Bicha <[e-mail]>
-Date: Fri, 13 Apr 2018 14:57:30 -0400
+Date: Fri, 13 Apr 2018 20:57:30 +0200
 Subject: Set nautilus as unremovable in GNOME Software
 
 for GNOME and Unity users since it is a depends of ubuntu-desktop
diff --git a/debian/patches/clear_pending_selection.patch b/debian/patches/clear_pending_selection.patch
 deleted file mode 100644
index f964dc9..0000000
--- a/debian/patches/clear_pending_selection.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Origin; https://gitlab.gnome.org/GNOME/nautilus/merge_requests/195
-From 416dfb1815fe83f73e335199eea5216e604a6fd6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <[e-mail]>
-Date: Thu, 19 Apr 2018 04:19:51 -0500
-Subject: [PATCH] window-slot: Clear pending_selection after freeing it
-
-This might not be the case when handling archive files
----
- src/nautilus-window-slot.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
-index 2fa9c3339..541dd24a8 100644
---- a/src/nautilus-window-slot.c
-+++ b/src/nautilus-window-slot.c
-@@ -1611,11 +1611,7 @@ handle_regular_file_if_needed (NautilusWindowSlot *self,
-     if ((parent_file != NULL) &&
-         nautilus_file_get_file_type (file) == G_FILE_TYPE_REGULAR)
-     {
--        if (priv->pending_selection != NULL)
--        {
--            nautilus_file_list_free (priv->pending_selection);
--        }
--
-+        g_clear_pointer (&priv->pending_selection, nautilus_file_list_free);
-         g_clear_object (&priv->pending_location);
-         g_clear_object (&priv->pending_file_to_activate);
-         g_free (priv->pending_scroll_to);
diff --git a/debian/patches/file-view-Always-unset-pending_selection-after-freeing-it.patch b/debian/patches/file-view-Always-unset-pending_selection-after-freeing-it.patch
 new file mode 100644
index 0000000..4191e7e
--- /dev/null
+++ b/debian/patches/file-view-Always-unset-pending_selection-after-freeing-it.patch
@@ -0,0 +1,80 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Thu, 26 Jul 2018 04:55:19 +0200
+Subject: file-view: Always unset pending_selection after freeing it
+
+When a file view was loaded with a pending selection, and not all the files were
+seen yet, the private pending_selection list was properly free'd, but the pointer
+was not cleared, causing a crash when `nautilus_files_view_set_selection` was
+called again, as it was trying to deeply copy a list pointed by this invalid
+reference.
+
+So, removing the unneeded `pending_selection` temporary pointer from the main
+function scope, as it only confuses, while use it (with an autolist) when we
+need to pass the previous `priv->pending_selection` (stealing its ownership)
+to set_selection again.
+
+Eventually use a g_clear_pointer to free the list and nullify its priv reference
+
+Fixes #295
+
+(cherry picked from commit ae3382a281b018337a8032ef13663ec2d9c7fd6c)
+
+Bug-GNOME: https://gitlab.gnome.org/GNOME/nautilus/issues/295
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1713581
+Applied-Upstream: commit: https://gitlab.gnome.org/GNOME/nautilus/commit/834c4e7f
+---
+ src/nautilus-files-view.c | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
+index f916b05..87a4a42 100644
+--- a/src/nautilus-files-view.c
++++ b/src/nautilus-files-view.c
+@@ -3587,7 +3587,6 @@ done_loading (NautilusFilesView *view,
+               gboolean           all_files_seen)
+ {
+     NautilusFilesViewPrivate *priv;
+-    GList *pending_selection;
+     GList *selection;
+     gboolean do_reveal = FALSE;
+ 
+@@ -3608,21 +3607,23 @@ done_loading (NautilusFilesView *view,
+         nautilus_files_view_update_toolbar_menus (view);
+         reset_update_interval (view);
+ 
+-        pending_selection = priv->pending_selection;
+         selection = nautilus_view_get_selection (NAUTILUS_VIEW (view));
+ 
+         if (nautilus_view_is_searching (NAUTILUS_VIEW (view)) &&
+-            all_files_seen && !selection && !pending_selection)
++            all_files_seen && selection == NULL && priv->pending_selection == NULL)
+         {
+             nautilus_files_view_select_first (view);
+             do_reveal = TRUE;
+         }
+-        else if (pending_selection != NULL && all_files_seen)
++        else if (priv->pending_selection != NULL && all_files_seen)
+         {
+-            priv->pending_selection = NULL;
++            GList *pending_selection;
++            pending_selection = g_steal_pointer (&priv->pending_selection);
+ 
+             nautilus_files_view_call_set_selection (view, pending_selection);
+             do_reveal = TRUE;
++
++            nautilus_file_list_free (pending_selection);
+         }
+ 
+         if (selection)
+@@ -3630,10 +3631,7 @@ done_loading (NautilusFilesView *view,
+             g_list_free_full (selection, g_object_unref);
+         }
+ 
+-        if (pending_selection)
+-        {
+-            g_list_free_full (pending_selection, g_object_unref);
+-        }
++        g_clear_pointer (&priv->pending_selection, nautilus_file_list_free);
+ 
+         if (do_reveal)
+         {
diff --git a/debian/patches/multiarch_fallback.patch b/debian/patches/multiarch_fallback.patch
index 0cc4b8f..42edf6e 100644
--- a/debian/patches/multiarch_fallback.patch
+++ b/debian/patches/multiarch_fallback.patch
@@ -1,12 +1,13 @@
-From 54592574c3cb951085c747680046b4787daca7f2 Mon Sep 17 00:00:00 2001
 From: Jeremy Bicha <[e-mail]>
 Date: Tue, 13 Sep 2016 21:33:50 -0400
 Subject: [PATCH] Load extensions from non-multiarch directory too
 
 ---
- src/nautilus-module.c |    1 +
+ src/nautilus-module.c | 1 +
  1 file changed, 1 insertion(+)
 
+diff --git a/src/nautilus-module.c b/src/nautilus-module.c
+index bf474bd..bd74cc7 100644
 --- a/src/nautilus-module.c
 +++ b/src/nautilus-module.c
 @@ -260,6 +260,7 @@ nautilus_module_setup (void)
diff --git a/debian/patches/nautilusgtkplacesview-show-error-if-volume-is-not-mo.patch b/debian/patches/nautilusgtkplacesview-show-error-if-volume-is-not-mo.patch
 new file mode 100644
index 0000000..e43f1d3
--- /dev/null
+++ b/debian/patches/nautilusgtkplacesview-show-error-if-volume-is-not-mo.patch
@@ -0,0 +1,45 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Tue, 17 Jul 2018 04:23:58 +0200
+Subject: nautilusgtkplacesview: show error if volume is not mounted
+
+Fixes crash as location would be NULL afterwards.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1764779
+Forwarded: not-needed
+---
+ src/gtk/nautilusgtkplacesview.c | 20 +++++++++++++++-----
+ 1 file changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/src/gtk/nautilusgtkplacesview.c b/src/gtk/nautilusgtkplacesview.c
+index b72085b..c5e98a5 100644
+--- a/src/gtk/nautilusgtkplacesview.c
++++ b/src/gtk/nautilusgtkplacesview.c
+@@ -1329,13 +1329,23 @@ volume_mount_ready_cb (GObject      *source_volume,
+       GFile *root;
+ 
+       mount = g_volume_get_mount (volume);
+-      root = g_mount_get_default_location (mount);
+ 
+-      if (priv->should_open_location)
+-        emit_open_location (NAUTILUS_GTK_PLACES_VIEW (user_data), root, priv->open_flags);
++      if (G_IS_MOUNT (mount))
++        {
++          root = g_mount_get_default_location (mount);
+ 
+-      g_object_unref (mount);
+-      g_object_unref (root);
++          if (priv->should_open_location)
++            emit_open_location (NAUTILUS_GTK_PLACES_VIEW (user_data), root, priv->open_flags);
++
++          g_object_unref (mount);
++          g_object_unref (root);
++        }
++      else
++        {
++          emit_show_error_message (NAUTILUS_GTK_PLACES_VIEW(user_data),
++                                   _("Unable to access location"),
++                                   _("volume not mounted"));
++        }
+     }
+ 
+   update_places (view);
diff --git a/debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch b/debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch
 new file mode 100644
index 0000000..fddae3e
--- /dev/null
+++ b/debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch
@@ -0,0 +1,1022 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
+Date: Thu, 26 Jul 2018 22:01:57 +0200
+Subject: query: add recursive flags and use it in search-engines
+
+Forwarded: yes, https://gitlab.gnome.org/GNOME/nautilus/merge_requests/249
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1767027
+Applied-Upstream: 3.29
+---
+ src/meson.build                      |  1 +
+ src/nautilus-application.c           | 11 ++----
+ src/nautilus-application.h           |  3 +-
+ src/nautilus-directory-async.c       |  4 +-
+ src/nautilus-file-private.h          |  3 +-
+ src/nautilus-file-utilities.c        | 48 +++++++++++++++++++++++
+ src/nautilus-file-utilities.h        |  6 +++
+ src/nautilus-file.c                  | 28 ++++++++++++++
+ src/nautilus-file.h                  |  2 +
+ src/nautilus-query-editor.c          | 20 +++++-----
+ src/nautilus-query.c                 | 28 +++++++-------
+ src/nautilus-query.h                 | 14 +++++--
+ src/nautilus-search-directory.c      |  6 ---
+ src/nautilus-search-engine-private.h | 31 +++++++++++++++
+ src/nautilus-search-engine-simple.c  | 74 +++++++++---------------------------
+ src/nautilus-search-engine-simple.h  |  2 +
+ src/nautilus-search-engine-tracker.c | 16 ++++----
+ src/nautilus-search-engine.c         | 36 +++++++++++++-----
+ src/nautilus-search-engine.h         |  2 -
+ src/nautilus-shell-search-provider.c | 50 ++++++++++++++++--------
+ src/nautilus-window-slot.c           | 19 ++++-----
+ src/nautilus-window-slot.h           |  2 +-
+ src/nautilus-window.c                |  4 +-
+ src/nautilus-window.h                |  2 +-
+ 24 files changed, 261 insertions(+), 151 deletions(-)
+ create mode 100644 src/nautilus-search-engine-private.h
+
+diff --git a/src/meson.build b/src/meson.build
+index a771d12..73aafe9 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -226,6 +226,7 @@ libnautilus_sources = [
+     'nautilus-search-provider.h',
+     'nautilus-search-engine.c',
+     'nautilus-search-engine.h',
++    'nautilus-search-engine-private.h',
+     'nautilus-search-engine-model.c',
+     'nautilus-search-engine-model.h',
+     'nautilus-search-engine-simple.c',
+diff --git a/src/nautilus-application.c b/src/nautilus-application.c
+index 1ec0d22..26ce836 100644
+--- a/src/nautilus-application.c
++++ b/src/nautilus-application.c
+@@ -1621,15 +1621,12 @@ nautilus_application_new (void)
+ 
+ void
+ nautilus_application_search (NautilusApplication *self,
+-                             const gchar         *uri,
+-                             const gchar         *text)
++                             NautilusQuery       *query)
+ {
++    g_autoptr (GFile) location = NULL;
+     NautilusWindow *window;
+-    GFile *location;
+ 
+-    location = g_file_new_for_uri (uri);
++    location = nautilus_query_get_location (query);
+     window = open_window (self, location);
+-    nautilus_window_search (window, text);
+-
+-    g_object_unref (location);
++    nautilus_window_search (window, query);
+ }
+diff --git a/src/nautilus-application.h b/src/nautilus-application.h
+index 9cb32c8..47adcc4 100644
+--- a/src/nautilus-application.h
++++ b/src/nautilus-application.h
+@@ -86,8 +86,7 @@ GtkWidget * nautilus_application_connect_server (NautilusApplication *applicatio
+ 						 NautilusWindow      *window);
+ 
+ void nautilus_application_search (NautilusApplication *application,
+-                                  const gchar         *uri,
+-                                  const gchar         *text);
++                                  NautilusQuery       *query);
+ void nautilus_application_startup_common (NautilusApplication *application);
+ 
+ void nautilus_application_update_dbus_opened_locations (NautilusApplication *app);
+diff --git a/src/nautilus-directory-async.c b/src/nautilus-directory-async.c
+index 05a87e3..a1a27de 100644
+--- a/src/nautilus-directory-async.c
++++ b/src/nautilus-directory-async.c
+@@ -4383,6 +4383,7 @@ got_filesystem_info (FilesystemInfoState *state,
+         file->details->filesystem_readonly =
+             g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_FILESYSTEM_READONLY);
+         filesystem_type = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_FILESYSTEM_TYPE);
++        file->details->filesystem_remote = g_file_info_get_attribute_boolean (info, G_FILE_ATTRIBUTE_FILESYSTEM_REMOTE);
+         if (g_strcmp0 (eel_ref_str_peek (file->details->filesystem_type), filesystem_type) != 0)
+         {
+             eel_ref_str_unref (file->details->filesystem_type);
+@@ -4465,7 +4466,8 @@ filesystem_info_start (NautilusDirectory *directory,
+     g_file_query_filesystem_info_async (location,
+                                         G_FILE_ATTRIBUTE_FILESYSTEM_READONLY ","
+                                         G_FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW ","
+-                                        G_FILE_ATTRIBUTE_FILESYSTEM_TYPE,
++                                        G_FILE_ATTRIBUTE_FILESYSTEM_TYPE ","
++                                        G_FILE_ATTRIBUTE_FILESYSTEM_REMOTE,
+                                         G_PRIORITY_DEFAULT,
+                                         state->cancellable,
+                                         query_filesystem_info_callback,
+diff --git a/src/nautilus-file-private.h b/src/nautilus-file-private.h
+index cb2bebb..5f6b209 100644
+--- a/src/nautilus-file-private.h
++++ b/src/nautilus-file-private.h
+@@ -202,7 +202,8 @@ struct NautilusFileDetails
+ 	eel_boolean_bit filesystem_readonly           : 1;
+ 	eel_boolean_bit filesystem_use_preview        : 2; /* GFilesystemPreviewType */
+ 	eel_boolean_bit filesystem_info_is_up_to_date : 1;
+-        eel_ref_str     filesystem_type;
++	eel_boolean_bit filesystem_remote             : 1;
++	eel_ref_str     filesystem_type;
+ 
+ 	time_t trash_time; /* 0 is unknown */
+ 	time_t recency; /* 0 is unknown */
+diff --git a/src/nautilus-file-utilities.c b/src/nautilus-file-utilities.c
+index e79f37b..f8d8476 100644
+--- a/src/nautilus-file-utilities.c
++++ b/src/nautilus-file-utilities.c
+@@ -1517,3 +1517,51 @@ nautilus_uri_to_native_uri (const gchar *uri)
+     return NULL;
+ }
+ 
++NautilusQueryRecursive
++location_settings_search_get_recursive (void)
++{
++    switch (g_settings_get_enum (nautilus_preferences, "recursive-search"))
++    {
++        case NAUTILUS_SPEED_TRADEOFF_ALWAYS:
++        {
++            return NAUTILUS_QUERY_RECURSIVE_ALWAYS;
++        }
++        break;
++
++        case NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY:
++        {
++            return NAUTILUS_QUERY_RECURSIVE_LOCAL_ONLY;
++        }
++        break;
++
++        case NAUTILUS_SPEED_TRADEOFF_NEVER:
++        {
++             return NAUTILUS_QUERY_RECURSIVE_NEVER;
++        }
++        break;
++    }
++
++    return NAUTILUS_QUERY_RECURSIVE_ALWAYS;
++}
++
++NautilusQueryRecursive
++location_settings_search_get_recursive_for_location (GFile *location)
++{
++    NautilusQueryRecursive recursive = location_settings_search_get_recursive ();
++
++    g_return_val_if_fail (location, recursive);
++
++    if (recursive == NAUTILUS_QUERY_RECURSIVE_LOCAL_ONLY)
++    {
++        g_autoptr (NautilusFile) file = nautilus_file_get_existing (location);
++
++        g_return_val_if_fail (file != NULL, recursive);
++
++        if (nautilus_file_is_remote (file))
++        {
++            recursive = NAUTILUS_QUERY_RECURSIVE_NEVER;
++        }
++    }
++
++    return recursive;
++}
+diff --git a/src/nautilus-file-utilities.h b/src/nautilus-file-utilities.h
+index b567611..b165d63 100644
+--- a/src/nautilus-file-utilities.h
++++ b/src/nautilus-file-utilities.h
+@@ -25,6 +25,9 @@
+ 
+ #include <gio/gio.h>
+ #include <gtk/gtk.h>
++#include <config.h>
++
++#include "nautilus-query.h"
+ 
+ #define NAUTILUS_DESKTOP_ID "org.gnome.Nautilus.desktop"
+ 
+@@ -127,4 +130,7 @@ GList * nautilus_file_list_from_uri_list (GList *uris);
+ 
+ gchar * nautilus_uri_to_native_uri (const gchar *uri);
+ 
++NautilusQueryRecursive location_settings_search_get_recursive (void);
++NautilusQueryRecursive location_settings_search_get_recursive_for_location (GFile *location);
++
+ #endif /* NAUTILUS_FILE_UTILITIES_H */
+diff --git a/src/nautilus-file.c b/src/nautilus-file.c
+index 3f6a69f..63413a6 100644
+--- a/src/nautilus-file.c
++++ b/src/nautilus-file.c
+@@ -4975,6 +4975,29 @@ nautilus_file_get_filesystem_type (NautilusFile *file)
+     return filesystem_type;
+ }
+ 
++gboolean
++nautilus_file_get_filesystem_remote (NautilusFile *file)
++{
++    NautilusFile *parent;
++
++    g_assert (NAUTILUS_IS_FILE (file));
++
++    if (nautilus_file_is_directory (file))
++    {
++        return file->details->filesystem_remote;
++    }
++    else
++    {
++        parent = nautilus_file_get_parent (file);
++        if (parent != NULL)
++        {
++            return parent->details->filesystem_remote;
++        }
++    }
++
++    return FALSE;
++}
++
+ gboolean
+ nautilus_file_should_show_thumbnail (NautilusFile *file)
+ {
+@@ -8376,6 +8399,11 @@ nautilus_file_is_remote (NautilusFile *file)
+ 
+     g_assert (NAUTILUS_IS_FILE (file));
+ 
++    if (nautilus_file_get_filesystem_remote (file))
++    {
++        return TRUE;
++    }
++
+     filesystem_type = nautilus_file_get_filesystem_type (file);
+ 
+     return filesystem_type != NULL && g_strv_contains (remote_types, filesystem_type);
+diff --git a/src/nautilus-file.h b/src/nautilus-file.h
+index 5b319f9..54fdcb3 100644
+--- a/src/nautilus-file.h
++++ b/src/nautilus-file.h
+@@ -253,6 +253,8 @@ char *                  nautilus_file_get_filesystem_id                 (Nautilu
+ 
+ char *                  nautilus_file_get_filesystem_type               (NautilusFile                   *file);
+ 
++gboolean                nautilus_file_get_filesystem_remote             (NautilusFile                   *file);
++
+ NautilusFile *          nautilus_file_get_trash_original_file           (NautilusFile                   *file);
+ 
+ /* Permissions. */
+diff --git a/src/nautilus-query-editor.c b/src/nautilus-query-editor.c
+index 94b9c4d..8398ad4 100644
+--- a/src/nautilus-query-editor.c
++++ b/src/nautilus-query-editor.c
+@@ -144,12 +144,12 @@ update_information_label (NautilusQueryEditor *editor)
+             fts_sensitive = FALSE;
+         }
+         else if (nautilus_file_is_remote (file) &&
+-                 !settings_search_is_recursive (editor))
++                 location_settings_search_get_recursive_for_location (priv->location) == NAUTILUS_QUERY_RECURSIVE_NEVER)
+         {
+             label = _("Remote location — only searching the current folder");
+             fts_sensitive = FALSE;
+         }
+-        else if (!settings_search_is_recursive (editor))
++        else if (location_settings_search_get_recursive_for_location (priv->location) == NAUTILUS_QUERY_RECURSIVE_NEVER)
+         {
+             label = _("Only searching the current folder");
+         }
+@@ -170,17 +170,18 @@ recursive_search_preferences_changed (GSettings           *settings,
+                                       gchar               *key,
+                                       NautilusQueryEditor *editor)
+ {
++
+     NautilusQueryEditorPrivate *priv;
+-    gboolean recursive;
++    NautilusQueryRecursive recursive;
+ 
+     priv = nautilus_query_editor_get_instance_private (editor);
+ 
+-    if (!priv->location || !priv->query)
++    if (!priv->query)
+     {
+         return;
+     }
+ 
+-    recursive = settings_search_is_recursive (editor);
++    recursive = location_settings_search_get_recursive ();
+     if (recursive != nautilus_query_get_recursive (priv->query))
+     {
+         nautilus_query_set_recursive (priv->query, recursive);
+@@ -382,7 +383,6 @@ create_query (NautilusQueryEditor *editor)
+     NautilusQueryEditorPrivate *priv;
+     NautilusQuery *query;
+     NautilusFile *file;
+-    gboolean recursive;
+     gboolean fts_enabled;
+ 
+     priv = nautilus_query_editor_get_instance_private (editor);
+@@ -396,11 +396,13 @@ create_query (NautilusQueryEditor *editor)
+ 
+     nautilus_query_set_search_content (query, fts_enabled);
+ 
+-    recursive = settings_search_is_recursive (editor);
+-
+     nautilus_query_set_text (query, gtk_entry_get_text (GTK_ENTRY (priv->entry)));
+     nautilus_query_set_location (query, priv->location);
+-    nautilus_query_set_recursive (query, recursive);
++
++    /* We only set the query using the global setting for recursivity here,
++     * it's up to the search engine to check weather it can proceed with
++     * deep search in the current directory or not. */
++    nautilus_query_set_recursive (query, location_settings_search_get_recursive ());
+ 
+     nautilus_query_editor_set_query (editor, query);
+ 
+diff --git a/src/nautilus-query.c b/src/nautilus-query.c
+index 59600d1..c3e4ef4 100644
+--- a/src/nautilus-query.c
++++ b/src/nautilus-query.c
+@@ -44,11 +44,11 @@ struct _NautilusQuery
+     GList *mime_types;
+     gboolean show_hidden;
+     GPtrArray *date_range;
++    NautilusQueryRecursive recursive;
+     NautilusQuerySearchType search_type;
+     NautilusQuerySearchContent search_content;
+ 
+     gboolean searching;
+-    gboolean recursive;
+     char **prepared_words;
+     GMutex prepared_words_mutex;
+ };
+@@ -118,7 +118,7 @@ nautilus_query_get_property (GObject    *object,
+ 
+         case PROP_RECURSIVE:
+         {
+-            g_value_set_boolean (value, self->recursive);
++            g_value_set_enum (value, self->recursive);
+         }
+         break;
+ 
+@@ -181,7 +181,7 @@ nautilus_query_set_property (GObject      *object,
+ 
+         case PROP_RECURSIVE:
+         {
+-            nautilus_query_set_recursive (self, g_value_get_boolean (value));
++            nautilus_query_set_recursive (self, g_value_get_enum (value));
+         }
+         break;
+ 
+@@ -272,11 +272,12 @@ nautilus_query_class_init (NautilusQueryClass *class)
+      */
+     g_object_class_install_property (gobject_class,
+                                      PROP_RECURSIVE,
+-                                     g_param_spec_boolean ("recursive",
+-                                                           "Whether the query is being performed on subdirectories",
+-                                                           "Whether the query is being performed on subdirectories or not",
+-                                                           FALSE,
+-                                                           G_PARAM_READWRITE));
++                                     g_param_spec_enum ("recursive",
++                                                        "Whether the query is being performed on subdirectories",
++                                                        "Whether the query is being performed on subdirectories or not",
++                                                        NAUTILUS_TYPE_QUERY_RECURSIVE,
++                                                        NAUTILUS_QUERY_RECURSIVE_ALWAYS,
++                                                        G_PARAM_READWRITE));
+ 
+     /**
+      * NautilusQuery::search-type:
+@@ -636,22 +637,21 @@ nautilus_query_set_searching (NautilusQuery *query,
+     }
+ }
+ 
+-gboolean
++NautilusQueryRecursive
+ nautilus_query_get_recursive (NautilusQuery *query)
+ {
+-    g_return_val_if_fail (NAUTILUS_IS_QUERY (query), FALSE);
++    g_return_val_if_fail (NAUTILUS_IS_QUERY (query),
++                          NAUTILUS_QUERY_RECURSIVE_ALWAYS);
+ 
+     return query->recursive;
+ }
+ 
+ void
+-nautilus_query_set_recursive (NautilusQuery *query,
+-                              gboolean       recursive)
++nautilus_query_set_recursive (NautilusQuery          *query,
++                              NautilusQueryRecursive  recursive)
+ {
+     g_return_if_fail (NAUTILUS_IS_QUERY (query));
+ 
+-    recursive = !!recursive;
+-
+     if (query->recursive != recursive)
+     {
+         query->recursive = recursive;
+diff --git a/src/nautilus-query.h b/src/nautilus-query.h
+index 2264f50..0e04061 100644
+--- a/src/nautilus-query.h
++++ b/src/nautilus-query.h
+@@ -35,6 +35,13 @@ typedef enum {
+         NAUTILUS_QUERY_SEARCH_CONTENT_FULL_TEXT,
+ } NautilusQuerySearchContent;
+ 
++typedef enum {
++        NAUTILUS_QUERY_RECURSIVE_NEVER,
++        NAUTILUS_QUERY_RECURSIVE_ALWAYS,
++        NAUTILUS_QUERY_RECURSIVE_LOCAL_ONLY,
++        NAUTILUS_QUERY_RECURSIVE_INDEXED_ONLY,
++} NautilusQueryRecursive;
++
+ #define NAUTILUS_TYPE_QUERY		(nautilus_query_get_type ())
+ 
+ G_DECLARE_FINAL_TYPE (NautilusQuery, nautilus_query, NAUTILUS, QUERY, GObject)
+@@ -67,10 +74,9 @@ GPtrArray*     nautilus_query_get_date_range     (NautilusQuery *query);
+ void           nautilus_query_set_date_range     (NautilusQuery *query,
+                                                   GPtrArray     *date_range);
+ 
+-gboolean       nautilus_query_get_recursive      (NautilusQuery *query);
+-
+-void           nautilus_query_set_recursive      (NautilusQuery *query,
+-                                                  gboolean       recursive);
++NautilusQueryRecursive nautilus_query_get_recursive (NautilusQuery *query);
++void                   nautilus_query_set_recursive (NautilusQuery          *query,
++                                                     NautilusQueryRecursive  recursive);
+ 
+ gboolean       nautilus_query_get_searching      (NautilusQuery *query);
+ 
+diff --git a/src/nautilus-search-directory.c b/src/nautilus-search-directory.c
+index ae710f3..d86fda2 100644
+--- a/src/nautilus-search-directory.c
++++ b/src/nautilus-search-directory.c
+@@ -176,8 +176,6 @@ static void
+ start_search (NautilusSearchDirectory *self)
+ {
+     NautilusSearchEngineModel *model_provider;
+-    NautilusSearchEngineSimple *simple_provider;
+-    gboolean recursive;
+ 
+     if (!self->query)
+     {
+@@ -205,10 +203,6 @@ start_search (NautilusSearchDirectory *self)
+     model_provider = nautilus_search_engine_get_model_provider (self->engine);
+     nautilus_search_engine_model_set_model (model_provider, self->base_model);
+ 
+-    simple_provider = nautilus_search_engine_get_simple_provider (self->engine);
+-    recursive = nautilus_query_get_recursive (self->query);
+-    g_object_set (simple_provider, "recursive", recursive, NULL);
+-
+     reset_file_list (self);
+ 
+     nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (self->engine));
+diff --git a/src/nautilus-search-engine-private.h b/src/nautilus-search-engine-private.h
+new file mode 100644
+index 0000000..e5f989f
+--- /dev/null
++++ b/src/nautilus-search-engine-private.h
+@@ -0,0 +1,31 @@
++/*
++ * Copyright (C) 2018 Canonical Ltd.
++ *
++ * Nautilus is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * Nautilus is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this program; see the file COPYING.  If not,
++ * see <http://www.gnu.org/licenses/>.
++ *
++ * Author: Marco Trevisan <[e-mail]>
++ *
++ */
++
++#pragma once
++
++#include "nautilus-query.h"
++
++typedef enum {
++        NAUTILUS_SEARCH_ENGINE_TYPE_NON_INDEXED,
++        NAUTILUS_SEARCH_ENGINE_TYPE_INDEXED,
++} NautilusSearchEngineType;
++
++gboolean is_recursive_search (NautilusSearchEngineType engine_type, NautilusQueryRecursive recursive, GFile *location);
+diff --git a/src/nautilus-search-engine-simple.c b/src/nautilus-search-engine-simple.c
+index 3ec9eb3..19a8616 100644
+--- a/src/nautilus-search-engine-simple.c
++++ b/src/nautilus-search-engine-simple.c
+@@ -20,9 +20,11 @@
+  */
+ 
+ #include <config.h>
++#include "nautilus-search-engine-simple.h"
++
++#include "nautilus-search-engine-private.h"
+ #include "nautilus-search-hit.h"
+ #include "nautilus-search-provider.h"
+-#include "nautilus-search-engine-simple.h"
+ #include "nautilus-ui-utilities.h"
+ #define DEBUG_FLAG NAUTILUS_DEBUG_SEARCH
+ #include "nautilus-debug.h"
+@@ -35,7 +37,7 @@
+ 
+ enum
+ {
+-    PROP_RECURSIVE = 1,
++    PROP_0,
+     PROP_RUNNING,
+     NUM_PROPERTIES
+ };
+@@ -52,7 +54,6 @@ typedef struct
+ 
+     GHashTable *visited;
+ 
+-    gboolean recursive;
+     gint n_processed_files;
+     GList *hits;
+ 
+@@ -66,8 +67,6 @@ struct _NautilusSearchEngineSimple
+     NautilusQuery *query;
+ 
+     SearchThreadData *active_search;
+-
+-    gboolean recursive;
+ };
+ 
+ static void nautilus_search_provider_init (NautilusSearchProviderInterface *iface);
+@@ -208,6 +207,9 @@ static void
+ visit_directory (GFile            *dir,
+                  SearchThreadData *data)
+ {
++    g_autoptr (GPtrArray) date_range = NULL;
++    NautilusQuerySearchType type;
++    NautilusQueryRecursive recursive;
+     GFileEnumerator *enumerator;
+     GFileInfo *info;
+     GFile *child;
+@@ -238,10 +240,12 @@ visit_directory (GFile            *dir,
+         return;
+     }
+ 
++    type = nautilus_query_get_search_type (data->query);
++    recursive = nautilus_query_get_recursive (data->query);
++    date_range = nautilus_query_get_date_range (data->query);
++
+     while ((info = g_file_enumerator_next_file (enumerator, data->cancellable, NULL)) != NULL)
+     {
+-        g_autoptr (GPtrArray) date_range = NULL;
+-
+         display_name = g_file_info_get_display_name (info);
+         if (display_name == NULL)
+         {
+@@ -276,15 +280,12 @@ visit_directory (GFile            *dir,
+         mtime = g_file_info_get_attribute_uint64 (info, "time::modified");
+         atime = g_file_info_get_attribute_uint64 (info, "time::access");
+ 
+-        date_range = nautilus_query_get_date_range (data->query);
+         if (found && date_range != NULL)
+         {
+-            NautilusQuerySearchType type;
+             guint64 current_file_time;
+ 
+             initial_date = g_ptr_array_index (date_range, 0);
+             end_date = g_ptr_array_index (date_range, 1);
+-            type = nautilus_query_get_search_type (data->query);
+ 
+             if (type == NAUTILUS_QUERY_SEARCH_TYPE_LAST_ACCESS)
+             {
+@@ -322,7 +323,10 @@ visit_directory (GFile            *dir,
+             send_batch (data);
+         }
+ 
+-        if (data->engine->recursive && g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
++        if (recursive != NAUTILUS_QUERY_RECURSIVE_NEVER &&
++            g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY &&
++            is_recursive_search (NAUTILUS_SEARCH_ENGINE_TYPE_NON_INDEXED,
++                                 recursive, child))
+         {
+             id = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_ID_FILE);
+             visited = FALSE;
+@@ -438,9 +442,9 @@ nautilus_search_engine_simple_set_query (NautilusSearchProvider *provider,
+ {
+     NautilusSearchEngineSimple *simple = NAUTILUS_SEARCH_ENGINE_SIMPLE (provider);
+ 
+-    g_object_ref (query);
+     g_clear_object (&simple->query);
+-    simple->query = query;
++
++    simple->query = g_object_ref (query);
+ }
+ 
+ static gboolean
+@@ -453,30 +457,6 @@ nautilus_search_engine_simple_is_running (NautilusSearchProvider *provider)
+     return simple->active_search != NULL;
+ }
+ 
+-static void
+-nautilus_search_engine_simple_set_property (GObject      *object,
+-                                            guint         arg_id,
+-                                            const GValue *value,
+-                                            GParamSpec   *pspec)
+-{
+-    NautilusSearchEngineSimple *engine = NAUTILUS_SEARCH_ENGINE_SIMPLE (object);
+-
+-    switch (arg_id)
+-    {
+-        case PROP_RECURSIVE:
+-        {
+-            engine->recursive = g_value_get_boolean (value);
+-        }
+-        break;
+-
+-        default:
+-        {
+-            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, arg_id, pspec);
+-        }
+-        break;
+-    }
+-}
+-
+ static void
+ nautilus_search_engine_simple_get_property (GObject    *object,
+                                             guint       arg_id,
+@@ -492,12 +472,6 @@ nautilus_search_engine_simple_get_property (GObject    *object,
+             g_value_set_boolean (value, nautilus_search_engine_simple_is_running (NAUTILUS_SEARCH_PROVIDER (engine)));
+         }
+         break;
+-
+-        case PROP_RECURSIVE:
+-        {
+-            g_value_set_boolean (value, engine->recursive);
+-        }
+-        break;
+     }
+ }
+ 
+@@ -518,20 +492,6 @@ nautilus_search_engine_simple_class_init (NautilusSearchEngineSimpleClass *class
+     gobject_class = G_OBJECT_CLASS (class);
+     gobject_class->finalize = finalize;
+     gobject_class->get_property = nautilus_search_engine_simple_get_property;
+-    gobject_class->set_property = nautilus_search_engine_simple_set_property;
+-
+-    /**
+-     * NautilusSearchEngineSimple::recursive:
+-     *
+-     * Whether the search is recursive or not.
+-     */
+-    g_object_class_install_property (gobject_class,
+-                                     PROP_RECURSIVE,
+-                                     g_param_spec_boolean ("recursive",
+-                                                           "recursive",
+-                                                           "recursive",
+-                                                           FALSE,
+-                                                           G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS));
+ 
+     /**
+      * NautilusSearchEngine::running:
+diff --git a/src/nautilus-search-engine-simple.h b/src/nautilus-search-engine-simple.h
+index dd6953f..d50b36d 100644
+--- a/src/nautilus-search-engine-simple.h
++++ b/src/nautilus-search-engine-simple.h
+@@ -22,6 +22,8 @@
+ #ifndef NAUTILUS_SEARCH_ENGINE_SIMPLE_H
+ #define NAUTILUS_SEARCH_ENGINE_SIMPLE_H
+ 
++#include <glib-object.h>
++
+ G_BEGIN_DECLS
+ 
+ #define NAUTILUS_TYPE_SEARCH_ENGINE_SIMPLE (nautilus_search_engine_simple_get_type ())
+diff --git a/src/nautilus-search-engine-tracker.c b/src/nautilus-search-engine-tracker.c
+index 4c917dd..8885ca4 100644
+--- a/src/nautilus-search-engine-tracker.c
++++ b/src/nautilus-search-engine-tracker.c
+@@ -22,7 +22,7 @@
+ #include <config.h>
+ #include "nautilus-search-engine-tracker.h"
+ 
+-#include "nautilus-global-preferences.h"
++#include "nautilus-search-engine-private.h"
+ #include "nautilus-search-hit.h"
+ #include "nautilus-search-provider.h"
+ #define DEBUG_FLAG NAUTILUS_DEBUG_SEARCH
+@@ -295,7 +295,6 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider)
+     GString *sparql;
+     GList *mimetypes, *l;
+     gint mime_count;
+-    gboolean recursive;
+     GPtrArray *date_range;
+ 
+     tracker = NAUTILUS_SEARCH_ENGINE_TRACKER (provider);
+@@ -317,10 +316,6 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider)
+         return;
+     }
+ 
+-    recursive = g_settings_get_enum (nautilus_preferences, "recursive-search") == NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY ||
+-                g_settings_get_enum (nautilus_preferences, "recursive-search") == NAUTILUS_SPEED_TRADEOFF_ALWAYS;
+-    tracker->recursive = recursive;
+-
+     tracker->fts_enabled = nautilus_query_get_search_content (tracker->query);
+ 
+     query_text = nautilus_query_get_text (tracker->query);
+@@ -468,13 +463,18 @@ static void
+ nautilus_search_engine_tracker_set_query (NautilusSearchProvider *provider,
+                                           NautilusQuery          *query)
+ {
++    g_autoptr(GFile) location = NULL;
+     NautilusSearchEngineTracker *tracker;
+ 
+     tracker = NAUTILUS_SEARCH_ENGINE_TRACKER (provider);
++    location = nautilus_query_get_location (query);
+ 
+-    g_object_ref (query);
+     g_clear_object (&tracker->query);
+-    tracker->query = query;
++
++    tracker->query = g_object_ref (query);
++    tracker->recursive = is_recursive_search (NAUTILUS_SEARCH_ENGINE_TYPE_INDEXED,
++                                              nautilus_query_get_recursive (query),
++                                              location);
+ }
+ 
+ static gboolean
+diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c
+index 209bd4f..3a0c9d4 100644
+--- a/src/nautilus-search-engine.c
++++ b/src/nautilus-search-engine.c
+@@ -20,14 +20,16 @@
+  */
+ 
+ #include <config.h>
+-
+-#include <glib/gi18n.h>
+-#include "nautilus-search-provider.h"
+ #include "nautilus-search-engine.h"
+-#include "nautilus-search-engine-simple.h"
++#include "nautilus-search-engine-private.h"
++
++#include "nautilus-file.h"
+ #include "nautilus-search-engine-model.h"
++#include "nautilus-search-provider.h"
++#include <glib/gi18n.h>
+ #define DEBUG_FLAG NAUTILUS_DEBUG_SEARCH
+ #include "nautilus-debug.h"
++#include "nautilus-search-engine-simple.h"
+ #include "nautilus-search-engine-tracker.h"
+ 
+ typedef struct
+@@ -417,12 +419,28 @@ nautilus_search_engine_get_model_provider (NautilusSearchEngine *engine)
+     return priv->model;
+ }
+ 
+-NautilusSearchEngineSimple *
+-nautilus_search_engine_get_simple_provider (NautilusSearchEngine *engine)
++gboolean
++is_recursive_search (NautilusSearchEngineType  engine_type,
++                     NautilusQueryRecursive    recursive,
++                     GFile                    *location)
+ {
+-    NautilusSearchEnginePrivate *priv;
++    switch (recursive)
++    {
++        case NAUTILUS_QUERY_RECURSIVE_NEVER:
++            return FALSE;
+ 
+-    priv = nautilus_search_engine_get_instance_private (engine);
++        case NAUTILUS_QUERY_RECURSIVE_ALWAYS:
++            return TRUE;
++
++        case NAUTILUS_QUERY_RECURSIVE_INDEXED_ONLY:
++            return engine_type == NAUTILUS_SEARCH_ENGINE_TYPE_INDEXED;
++
++        case NAUTILUS_QUERY_RECURSIVE_LOCAL_ONLY:
++        {
++            g_autoptr (NautilusFile) file = nautilus_file_get (location);
++            return !nautilus_file_is_remote (file);
++        }
++    }
+ 
+-    return priv->simple;
++    return TRUE;
+ }
+diff --git a/src/nautilus-search-engine.h b/src/nautilus-search-engine.h
+index 0416e83..435908a 100644
+--- a/src/nautilus-search-engine.h
++++ b/src/nautilus-search-engine.h
+@@ -42,8 +42,6 @@ struct _NautilusSearchEngineClass
+ NautilusSearchEngine *nautilus_search_engine_new                (void);
+ NautilusSearchEngineModel *
+                       nautilus_search_engine_get_model_provider (NautilusSearchEngine *engine);
+-NautilusSearchEngineSimple *
+-                      nautilus_search_engine_get_simple_provider (NautilusSearchEngine *engine);
+ 
+ G_END_DECLS
+ 
+diff --git a/src/nautilus-shell-search-provider.c b/src/nautilus-shell-search-provider.c
+index cdadc08..ffc2b7f 100644
+--- a/src/nautilus-shell-search-provider.c
++++ b/src/nautilus-shell-search-provider.c
+@@ -426,15 +426,30 @@ search_add_volumes_and_bookmarks (PendingSearch *search)
+     g_object_unref (volume_monitor);
+ }
+ 
++static NautilusQuery*
++shell_query_new (gchar **terms)
++{
++    NautilusQuery *query;
++    g_autoptr (GFile) home = NULL;
++    g_autofree gchar *terms_joined = NULL;
++
++    terms_joined = g_strjoinv (" ", terms);
++    home = g_file_new_for_path (g_get_home_dir ());
++
++    query = nautilus_query_new ();
++    nautilus_query_set_text (query, terms_joined);
++    nautilus_query_set_location (query, home);
++
++    return query;
++}
++
+ static void
+ execute_search (NautilusShellSearchProvider  *self,
+                 GDBusMethodInvocation        *invocation,
+                 gchar                       **terms)
+ {
+-    gchar *terms_joined;
+     NautilusQuery *query;
+     PendingSearch *pending_search;
+-    GFile *home;
+ 
+     cancel_current_search (self);
+ 
+@@ -446,13 +461,9 @@ execute_search (NautilusShellSearchProvider  *self,
+         return;
+     }
+ 
+-    terms_joined = g_strjoinv (" ", terms);
+-    home = g_file_new_for_path (g_get_home_dir ());
+-
+-    query = nautilus_query_new ();
++    query = shell_query_new (terms);
++    nautilus_query_set_recursive (query, NAUTILUS_QUERY_RECURSIVE_INDEXED_ONLY);
+     nautilus_query_set_show_hidden_files (query, FALSE);
+-    nautilus_query_set_text (query, terms_joined);
+-    nautilus_query_set_location (query, home);
+ 
+     pending_search = g_slice_new0 (PendingSearch);
+     pending_search->invocation = g_object_ref (invocation);
+@@ -479,9 +490,6 @@ execute_search (NautilusShellSearchProvider  *self,
+     nautilus_search_provider_set_query (NAUTILUS_SEARCH_PROVIDER (pending_search->engine),
+                                         query);
+     nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (pending_search->engine));
+-
+-    g_clear_object (&home);
+-    g_free (terms_joined);
+ }
+ 
+ static gboolean
+@@ -713,13 +721,23 @@ handle_launch_search (NautilusShellSearchProvider2  *skeleton,
+                       gpointer                       user_data)
+ {
+     GApplication *app = g_application_get_default ();
+-    gchar *string = g_strjoinv (" ", terms);
+-    gchar *uri = nautilus_get_home_directory_uri ();
++    g_autoptr (NautilusQuery) query = shell_query_new (terms);
+ 
+-    nautilus_application_search (NAUTILUS_APPLICATION (app), uri, string);
++    if (location_settings_search_get_recursive () == NAUTILUS_QUERY_RECURSIVE_NEVER)
++    {
++        /*
++         * If no recursive search is enabled, we still want to be able to
++         * show the same results we presented in the overview when nautilus
++         * is explicitly launched to access to more results, and thus we perform
++         * a query showing results coming from index-based search engines.
++         * Otherwise we just respect the user settings.
++         * See: https://gitlab.gnome.org/GNOME/nautilus/merge_requests/249
++         */
++        nautilus_query_set_recursive (query,
++                                      NAUTILUS_QUERY_RECURSIVE_INDEXED_ONLY);
++    }
+ 
+-    g_free (string);
+-    g_free (uri);
++    nautilus_application_search (NAUTILUS_APPLICATION (app), query);
+ 
+     nautilus_shell_search_provider2_complete_launch_search (skeleton, invocation);
+     return TRUE;
+diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
+index 7b27244..9b9a7aa 100644
+--- a/src/nautilus-window-slot.c
++++ b/src/nautilus-window-slot.c
+@@ -100,6 +100,7 @@ typedef struct
+ 
+     /* Query editor */
+     NautilusQueryEditor *query_editor;
++    NautilusQuery *pending_search_query;
+     gulong qe_changed_id;
+     gulong qe_cancel_id;
+     gulong qe_activated_id;
+@@ -110,7 +111,6 @@ typedef struct
+      * finish. Used for showing a spinner to provide feedback to the user. */
+     gboolean allow_stop;
+     gboolean needs_reload;
+-    gchar *pending_search_text;
+ 
+     /* New location. */
+     GFile *pending_location;
+@@ -361,9 +361,9 @@ update_search_visible (NautilusWindowSlot *self)
+         g_object_unref (query);
+     }
+ 
+-    if (priv->pending_search_text)
++    if (priv->pending_search_query)
+     {
+-        nautilus_window_slot_search (self, g_strdup (priv->pending_search_text));
++        nautilus_window_slot_search (self, g_object_ref (priv->pending_search_query));
+     }
+ }
+ 
+@@ -589,17 +589,13 @@ nautilus_window_slot_get_search_visible (NautilusWindowSlot *self)
+ 
+ void
+ nautilus_window_slot_search (NautilusWindowSlot *self,
+-                             const gchar        *text)
++                             NautilusQuery      *query)
+ {
+     NautilusWindowSlotPrivate *priv;
+     NautilusView *view;
+ 
+     priv = nautilus_window_slot_get_instance_private (self);
+-    if (priv->pending_search_text)
+-    {
+-        g_free (priv->pending_search_text);
+-        priv->pending_search_text = NULL;
+-    }
++    g_clear_object (&priv->pending_search_query);
+ 
+     view = nautilus_window_slot_get_current_view (self);
+     /* We could call this when the location is still being checked in the
+@@ -608,11 +604,11 @@ nautilus_window_slot_search (NautilusWindowSlot *self,
+     if (view)
+     {
+         nautilus_window_slot_set_search_visible (self, TRUE);
+-        nautilus_query_editor_set_text (priv->query_editor, text);
++        nautilus_query_editor_set_query (priv->query_editor, query);
+     }
+     else
+     {
+-        priv->pending_search_text = g_strdup (text);
++        priv->pending_search_query = g_object_ref (query);
+     }
+ }
+ 
+@@ -2812,6 +2808,7 @@ nautilus_window_slot_dispose (GObject *object)
+     g_clear_object (&priv->current_location_bookmark);
+     g_clear_object (&priv->last_location_bookmark);
+     g_clear_object (&priv->slot_action_group);
++    g_clear_object (&priv->pending_search_query);
+ 
+     g_clear_pointer (&priv->find_mount_cancellable, g_cancellable_cancel);
+ 
+diff --git a/src/nautilus-window-slot.h b/src/nautilus-window-slot.h
+index 573357d..f67b6ab 100644
+--- a/src/nautilus-window-slot.h
++++ b/src/nautilus-window-slot.h
+@@ -112,7 +112,7 @@ void     nautilus_window_slot_set_active                   (NautilusWindowSlot *
+ gboolean nautilus_window_slot_get_loading                  (NautilusWindowSlot *slot);
+ 
+ void     nautilus_window_slot_search                       (NautilusWindowSlot *slot,
+-                                                            const gchar        *text);
++                                                            NautilusQuery      *query);
+ 
+ gboolean nautilus_window_slot_handles_location (NautilusWindowSlot *self,
+                                                 GFile              *location);
+diff --git a/src/nautilus-window.c b/src/nautilus-window.c
+index d355e1e..b10c623 100644
+--- a/src/nautilus-window.c
++++ b/src/nautilus-window.c
+@@ -3107,14 +3107,14 @@ nautilus_window_show_about_dialog (NautilusWindow *window)
+ 
+ void
+ nautilus_window_search (NautilusWindow *window,
+-                        const gchar    *text)
++                        NautilusQuery  *query)
+ {
+     NautilusWindowSlot *active_slot;
+ 
+     active_slot = nautilus_window_get_active_slot (window);
+     if (active_slot)
+     {
+-        nautilus_window_slot_search (active_slot, text);
++        nautilus_window_slot_search (active_slot, query);
+     }
+     else
+     {
+diff --git a/src/nautilus-window.h b/src/nautilus-window.h
+index 39b16e7..c1196d3 100644
+--- a/src/nautilus-window.h
++++ b/src/nautilus-window.h
+@@ -135,7 +135,7 @@ void nautilus_window_end_dnd (NautilusWindow *window,
+                               GdkDragContext *context);
+ 
+ void nautilus_window_search (NautilusWindow *window,
+-                             const gchar    *text);
++                             NautilusQuery  *query);
+ 
+ void nautilus_window_initialize_slot (NautilusWindow          *window,
+                                       NautilusWindowSlot      *slot,
diff --git a/debian/patches/series b/debian/patches/series
index d6c50a8..41a35d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
+Revert-Revert-nautilus-file-Don-t-show-thumbnails-for-the.patch
+Revert-Revert-files-view-Remove-new-empty-folder-name-sug.patch
 multiarch_fallback.patch
 03_translations_list_update.patch
 04_suppress_umount_in_ltsp.patch
@@ -14,10 +16,11 @@ ubuntu_backspace_behaviour.patch
 0001-Respect-gtk-dialogs-use-header-for-all-dialogs.patch
 #Needs updating
 #16_unity_new_documents.patch
+query-add-recursive-flags-and-use-it-in-search-engines.patch
 0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch
 0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch
 0017-recent-add-function-to-update-manager-on-file-rename.patch
 0018-search-engine-add-locate-based-search-engine.patch
 appstream-compulsory.patch
-server_list_segfault.patch
-clear_pending_selection.patch
+nautilusgtkplacesview-show-error-if-volume-is-not-mo.patch
+file-view-Always-unset-pending_selection-after-freeing-it.patch
diff --git a/debian/patches/server_list_segfault.patch b/debian/patches/server_list_segfault.patch
 deleted file mode 100644
index 28e0784..0000000
--- a/debian/patches/server_list_segfault.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 5a5ce0e210a97fbde85a37d24269415b11dcf5d8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <[e-mail]>
-Date: Thu, 19 Apr 2018 03:04:58 -0500
-Subject: [PATCH 1/2] nautilusgtkplacesview: unset entry_pulse_timeout_id
- before removing it
-
-Fixes a warning on widget finalize, when trying to remove an invalid
-source.
----
- src/gtk/nautilusgtkplacesview.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/gtk/nautilusgtkplacesview.c b/src/gtk/nautilusgtkplacesview.c
-index de0610e52..e00576658 100644
---- a/src/gtk/nautilusgtkplacesview.c
-+++ b/src/gtk/nautilusgtkplacesview.c
-@@ -1405,6 +1405,7 @@ pulse_entry_cb (gpointer user_data)
-     {
-       gtk_entry_set_progress_pulse_step (GTK_ENTRY (priv->address_entry), 0.0);
-       gtk_entry_set_progress_fraction (GTK_ENTRY (priv->address_entry), 0.0);
-+      priv->entry_pulse_timeout_id = 0;
- 
-       return G_SOURCE_REMOVE;
-     }
--- 
-2.14.3
-
-
-From 8571e5735d4237d98f286f9d9fce59d8519826a7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <[e-mail]>
-Date: Thu, 19 Apr 2018 03:06:31 -0500
-Subject: [PATCH 2/2] nautilusgtkplacesview: disconnect from server list
- monitor changes on destroy
-
-It might happen otherwise that a change is recorded in between the
-widget dispose and finalization, causing a crash when setting
-the visible name for the GtkStack (as that will be NULL at that point)
-
-Fixes #140
----
- src/gtk/nautilusgtkplacesview.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/gtk/nautilusgtkplacesview.c b/src/gtk/nautilusgtkplacesview.c
-index e00576658..041849f60 100644
---- a/src/gtk/nautilusgtkplacesview.c
-+++ b/src/gtk/nautilusgtkplacesview.c
-@@ -401,6 +401,9 @@ nautilus_gtk_places_view_destroy (GtkWidget *widget)
-   if (priv->network_monitor)
-     g_signal_handlers_disconnect_by_func (priv->network_monitor, update_places, widget);
- 
-+  if (priv->server_list_monitor)
-+    g_signal_handlers_disconnect_by_func (priv->server_list_monitor, server_file_changed_cb, widget);
-+
-   g_cancellable_cancel (priv->cancellable);
-   g_cancellable_cancel (priv->networks_fetching_cancellable);
-
diff --git a/debian/patches/ubuntu_backspace_behaviour.patch b/debian/patches/ubuntu_backspace_behaviour.patch
index 097c06f..25573ce 100644
--- a/debian/patches/ubuntu_backspace_behaviour.patch
+++ b/debian/patches/ubuntu_backspace_behaviour.patch
@@ -1,17 +1,17 @@
-From b97f085565bac06d90a8577c3e3b9c2969ab3456 Mon Sep 17 00:00:00 2001
-From: Sebastien Noël <[e-mail]>
+From: =?utf-8?q?Sebastien_No=C3=ABl?= <[e-mail]>
 Date: Tue, 28 Jan 2014 19:08:31 +0000
 Subject: Restore backspace for going to parent folder
 
 This restores the behaviour from nautilus <= 3.4.
 ---
----
- src/nautilus-window.c |    2 ++
+ src/nautilus-window.c | 2 ++
  1 file changed, 2 insertions(+)
 
+diff --git a/src/nautilus-window.c b/src/nautilus-window.c
+index 0bff4e0..d355e1e 100644
 --- a/src/nautilus-window.c
 +++ b/src/nautilus-window.c
-@@ -2291,6 +2291,7 @@ const GActionEntry win_entries[] =
+@@ -2244,6 +2244,7 @@ const GActionEntry win_entries[] =
  {
      { "back", action_back },
      { "forward", action_forward },
@@ -19,9 +19,9 @@ This restores the behaviour from nautilus <= 3.4.
      { "up", action_up },
      { "view-menu", action_toggle_state_view_button, NULL, "false", NULL },
      { "reload", action_reload },
-@@ -2359,6 +2360,7 @@ nautilus_window_initialize_actions (Naut
-     nautilus_application_set_accelerator (app, "win.prompt-root-location", "slash");
-     nautilus_application_set_accelerator (app, "win.prompt-home-location", "asciitilde");
+@@ -2319,6 +2320,7 @@ nautilus_window_initialize_actions (NautilusWindow *window)
+     /* Support keyboard layouts which have a dead tilde key but not a tilde key. */
+     nautilus_application_set_accelerators (app, "win.prompt-home-location", prompt_home_location_accels);
      nautilus_application_set_accelerator (app, "win.view-menu", "F10");
 +    nautilus_application_set_accelerator (app, "win.backspaceup", "BackSpace");
      nautilus_application_set_accelerator (app, "win.restore-tab", "<shift><control>t");
diff --git a/debian/patches/ubuntu_infobars_color.patch b/debian/patches/ubuntu_infobars_color.patch
index 6cb9cbe..edbbe7f 100644
--- a/debian/patches/ubuntu_infobars_color.patch
+++ b/debian/patches/ubuntu_infobars_color.patch
@@ -1,15 +1,20 @@
-Description: set the infobars type to "other" rather than "question"
- to avoid blue cluebars
+From: Ubuntu Developers <[e-mail]>
+Date: Fri, 20 Jul 2018 03:25:37 +0200
+Subject: set the infobars type to "other" rather than "question"
+
+to avoid blue cluebars
 Bug-Ubuntu: https://launchpad.net/bugs/1259059
 ---
- src/nautilus-special-location-bar.c |    2 +-
- src/nautilus-trash-bar.c            |    2 +-
- src/nautilus-x-content-bar.c        |    2 +-
+ src/nautilus-special-location-bar.c | 2 +-
+ src/nautilus-trash-bar.c            | 2 +-
+ src/nautilus-x-content-bar.c        | 2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)
 
+diff --git a/src/nautilus-special-location-bar.c b/src/nautilus-special-location-bar.c
+index dc10a82..2f9e7b6 100644
 --- a/src/nautilus-special-location-bar.c
 +++ b/src/nautilus-special-location-bar.c
-@@ -191,7 +191,7 @@ GtkWidget *
+@@ -188,7 +188,7 @@ GtkWidget *
  nautilus_special_location_bar_new (NautilusSpecialLocation location)
  {
      return g_object_new (NAUTILUS_TYPE_SPECIAL_LOCATION_BAR,
@@ -18,9 +23,11 @@ Bug-Ubuntu: https://launchpad.net/bugs/1259059
                           "special-location", location,
                           NULL);
  }
+diff --git a/src/nautilus-trash-bar.c b/src/nautilus-trash-bar.c
+index 798a023..2c2cdeb 100644
 --- a/src/nautilus-trash-bar.c
 +++ b/src/nautilus-trash-bar.c
-@@ -242,6 +242,6 @@ nautilus_trash_bar_new (NautilusFilesVie
+@@ -242,6 +242,6 @@ nautilus_trash_bar_new (NautilusFilesView *view)
  {
      return g_object_new (NAUTILUS_TYPE_TRASH_BAR,
                           "view", view,
@@ -28,9 +35,11 @@ Bug-Ubuntu: https://launchpad.net/bugs/1259059
 +                         "message-type", GTK_MESSAGE_OTHER,
                           NULL);
  }
+diff --git a/src/nautilus-x-content-bar.c b/src/nautilus-x-content-bar.c
+index f37c846..2c41e97 100644
 --- a/src/nautilus-x-content-bar.c
 +++ b/src/nautilus-x-content-bar.c
-@@ -345,7 +345,7 @@ nautilus_x_content_bar_new (GMount
+@@ -345,7 +345,7 @@ nautilus_x_content_bar_new (GMount             *mount,
                              const char * const *x_content_types)
  {
      return g_object_new (NAUTILUS_TYPE_X_CONTENT_BAR,
diff --git a/debian/patches/ubuntu_revert_no_wallpaper.patch b/debian/patches/ubuntu_revert_no_wallpaper.patch
index ae64e63..8c750ef 100644
--- a/debian/patches/ubuntu_revert_no_wallpaper.patch
+++ b/debian/patches/ubuntu_revert_no_wallpaper.patch
@@ -1,18 +1,19 @@
-From 90625221ec1ef82fe221c3d376d92f40154cae69 Mon Sep 17 00:00:00 2001
 From: Lars Uebernickel <[e-mail]>
 Date: Fri, 30 Oct 2015 10:42:23 +0100
 Subject: [PATCH] Restore background drawing
 
 ---
- nautilus-desktop/meson.build                    |    2 
- nautilus-desktop/nautilus-desktop-background.c  |  627 ++++++++++++++++++++++++
- nautilus-desktop/nautilus-desktop-background.h  |   68 ++
- nautilus-desktop/nautilus-desktop-canvas-view.c |   40 -
- nautilus-desktop/nautilus-desktop-window.c      |   12 
+ nautilus-desktop/meson.build                    |   2 +
+ nautilus-desktop/nautilus-desktop-background.c  | 627 ++++++++++++++++++++++++
+ nautilus-desktop/nautilus-desktop-background.h  |  68 +++
+ nautilus-desktop/nautilus-desktop-canvas-view.c |  40 +-
+ nautilus-desktop/nautilus-desktop-window.c      |  12 +
  5 files changed, 735 insertions(+), 14 deletions(-)
  create mode 100644 nautilus-desktop/nautilus-desktop-background.c
  create mode 100644 nautilus-desktop/nautilus-desktop-background.h
 
+diff --git a/nautilus-desktop/meson.build b/nautilus-desktop/meson.build
+index a5e207d..d853982 100644
 --- a/nautilus-desktop/meson.build
 +++ b/nautilus-desktop/meson.build
 @@ -2,6 +2,8 @@ nautilus_desktop_sources = [
@@ -24,6 +25,9 @@ Subject: [PATCH] Restore background drawing
      'nautilus-desktop-canvas-view.c',
      'nautilus-desktop-canvas-view.h',
      'nautilus-desktop-canvas-view-container.c',
+diff --git a/nautilus-desktop/nautilus-desktop-background.c b/nautilus-desktop/nautilus-desktop-background.c
+new file mode 100644
+index 0000000..8d1d174
 --- /dev/null
 +++ b/nautilus-desktop/nautilus-desktop-background.c
 @@ -0,0 +1,627 @@
@@ -654,6 +658,9 @@ Subject: [PATCH] Restore background drawing
 +                             "widget", container,
 +                             NULL);
 +}
+diff --git a/nautilus-desktop/nautilus-desktop-background.h b/nautilus-desktop/nautilus-desktop-background.h
+new file mode 100644
+index 0000000..29b342e
 --- /dev/null
 +++ b/nautilus-desktop/nautilus-desktop-background.h
 @@ -0,0 +1,68 @@
@@ -725,6 +732,8 @@ Subject: [PATCH] Restore background drawing
 +};
 +
 +#endif /* __NAUTILIUS_DESKTOP_BACKGROUND_H__ */
+diff --git a/nautilus-desktop/nautilus-desktop-canvas-view.c b/nautilus-desktop/nautilus-desktop-canvas-view.c
+index 16a285f..b281a28 100644
 --- a/nautilus-desktop/nautilus-desktop-canvas-view.c
 +++ b/nautilus-desktop/nautilus-desktop-canvas-view.c
 @@ -26,6 +26,7 @@
@@ -743,7 +752,7 @@ Subject: [PATCH] Restore background drawing
  };
  
  static void     default_zoom_level_changed (gpointer user_data);
-@@ -243,6 +245,23 @@ desktop_canvas_view_property_filter (Gdk
+@@ -243,6 +245,23 @@ desktop_canvas_view_property_filter (GdkXEvent *gdk_xevent,
      return GDK_FILTER_CONTINUE;
  }
  
@@ -767,7 +776,7 @@ Subject: [PATCH] Restore background drawing
  static guint
  real_get_id (NautilusFilesView *view)
  {
-@@ -266,6 +285,12 @@ nautilus_desktop_canvas_view_dispose (GO
+@@ -266,6 +285,12 @@ nautilus_desktop_canvas_view_dispose (GObject *object)
                                            nautilus_files_view_update_context_menus,
                                            canvas_view);
  
@@ -780,7 +789,7 @@ Subject: [PATCH] Restore background drawing
      G_OBJECT_CLASS (nautilus_desktop_canvas_view_parent_class)->dispose (object);
  }
  
-@@ -328,6 +353,7 @@ nautilus_desktop_canvas_view_class_init
+@@ -328,6 +353,7 @@ nautilus_desktop_canvas_view_class_init (NautilusDesktopCanvasViewClass *class)
  
      canvas_class->create_canvas_container = real_create_canvas_container;
  
@@ -788,7 +797,7 @@ Subject: [PATCH] Restore background drawing
      vclass->update_context_menus = real_update_context_menus;
      vclass->get_view_id = real_get_id;
      vclass->end_loading = nautilus_desktop_canvas_view_end_loading;
-@@ -374,17 +400,6 @@ realized_callback (GtkWidget
+@@ -374,17 +400,6 @@ realized_callback (GtkWidget                 *widget,
                             desktop_canvas_view);
  }
  
@@ -806,7 +815,7 @@ Subject: [PATCH] Restore background drawing
  static NautilusCanvasZoomLevel
  get_default_zoom_level (void)
  {
-@@ -737,9 +752,6 @@ nautilus_desktop_canvas_view_init (Nauti
+@@ -737,9 +752,6 @@ nautilus_desktop_canvas_view_init (NautilusDesktopCanvasView *desktop_canvas_vie
      nautilus_files_view_set_show_foreign (NAUTILUS_FILES_VIEW (desktop_canvas_view),
                                            FALSE);
  
@@ -816,6 +825,8 @@ Subject: [PATCH] Restore background drawing
      g_signal_connect_object (desktop_canvas_view, "realize",
                               G_CALLBACK (realized_callback), desktop_canvas_view, 0);
      g_signal_connect_object (desktop_canvas_view, "unrealize",
+diff --git a/nautilus-desktop/nautilus-desktop-window.c b/nautilus-desktop/nautilus-desktop-window.c
+index f35c849..cc557c8 100644
 --- a/nautilus-desktop/nautilus-desktop-window.c
 +++ b/nautilus-desktop/nautilus-desktop-window.c
 @@ -44,6 +44,7 @@
diff --git a/debian/patches/ubuntu_sync_background_to_accountsservice.patch b/debian/patches/ubuntu_sync_background_to_accountsservice.patch
index 9953d85..56e6b5e 100644
--- a/debian/patches/ubuntu_sync_background_to_accountsservice.patch
+++ b/debian/patches/ubuntu_sync_background_to_accountsservice.patch
@@ -1,14 +1,19 @@
-Description: Sync chosen background filename to accountsservice
- used in lightdm by unity-greeter
+From: Ubuntu Developers <[e-mail]>
+Date: Fri, 20 Jul 2018 03:25:37 +0200
+Subject: Sync chosen background filename to accountsservice
+
+used in lightdm by unity-greeter
 Bug: https://launchpad.net/bugs/1128492
 Bug: https://launchpad.net/bugs/928553
 ---
- nautilus-desktop/nautilus-desktop-background.c |   81 +++++++++++++++++++++++++
+ nautilus-desktop/nautilus-desktop-background.c | 81 ++++++++++++++++++++++++++
  1 file changed, 81 insertions(+)
 
+diff --git a/nautilus-desktop/nautilus-desktop-background.c b/nautilus-desktop/nautilus-desktop-background.c
+index 8d1d174..1f0668b 100644
 --- a/nautilus-desktop/nautilus-desktop-background.c
 +++ b/nautilus-desktop/nautilus-desktop-background.c
-@@ -75,6 +75,85 @@ struct NautilusDesktopBackgroundDetails
+@@ -75,6 +75,85 @@ struct NautilusDesktopBackgroundDetails {
  };
  
  
@@ -94,7 +99,7 @@ Bug: https://launchpad.net/bugs/928553
  static gboolean
  background_settings_change_event_cb (GSettings *settings,
                                       gpointer   keys,
-@@ -460,6 +539,8 @@ background_change_event_idle_cb (Nautilu
+@@ -460,6 +539,8 @@ background_change_event_idle_cb (NautilusDesktopBackground *self)
      gnome_bg_load_from_preferences (self->details->bg,
                                      gnome_background_preferences);
  
diff --git a/debian/patches/zg_activity_logging.patch b/debian/patches/zg_activity_logging.patch
index c0ac76a..c713a3f 100644
--- a/debian/patches/zg_activity_logging.patch
+++ b/debian/patches/zg_activity_logging.patch
@@ -1,22 +1,23 @@
-From 7ebf2ec608b69d4e3f8cb39d8c55af7f32744c74 Mon Sep 17 00:00:00 2001
 From: Rico Tzschichholz <[e-mail]>
 Date: Wed, 2 Dec 2015 15:31:19 +0100
 Subject: [PATCH] Add zeitgeist activity logging
 
 ---
- meson.build                    |    2 
- src/nautilus-file-operations.c |  198 +++++++++++++++++++++++
- src/nautilus-file.c            |   26 +++
- test/meson.build               |    5 
- test/run-zeitgeist-test.sh     |   50 +++++
- test/test-nautilus-zeitgeist.c |  343 +++++++++++++++++++++++++++++++++++++++++
+ meson.build                    |   2 +
+ src/nautilus-file-operations.c | 198 ++++++++++++++++++++++++
+ src/nautilus-file.c            |  26 ++++
+ test/meson.build               |   5 +
+ test/run-zeitgeist-test.sh     |  50 ++++++
+ test/test-nautilus-zeitgeist.c | 343 +++++++++++++++++++++++++++++++++++++++++
  6 files changed, 624 insertions(+)
- create mode 100755 test/run-zeitgeist-test.sh
+ create mode 100644 test/run-zeitgeist-test.sh
  create mode 100644 test/test-nautilus-zeitgeist.c
 
+diff --git a/meson.build b/meson.build
+index 4d2acf2..21991e9 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -58,6 +58,8 @@ gio_unix = dependency ('gio-unix-2.0', v
+@@ -55,6 +55,8 @@ gio_unix = dependency ('gio-unix-2.0', version: glib_ver)
  gsettings_desktop_schemas = dependency ('gsettings-desktop-schemas',
                                          version: schemas_ver)
  
@@ -25,6 +26,8 @@ Subject: [PATCH] Add zeitgeist activity logging
  libm = cc.find_library ('libm')
  
  conf = configuration_data ()
+diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c
+index c641ec5..93ff3fe 100644
 --- a/src/nautilus-file-operations.c
 +++ b/src/nautilus-file-operations.c
 @@ -61,6 +61,8 @@
@@ -36,7 +39,7 @@ Subject: [PATCH] Add zeitgeist activity logging
  /* TODO: TESTING!!! */
  
  typedef struct
-@@ -234,6 +236,112 @@ typedef struct
+@@ -235,6 +237,112 @@ typedef struct
  #define MERGE_ALL _("Merge _All")
  #define COPY_FORCE _("Copy _Anyway")
  
@@ -149,7 +152,7 @@ Subject: [PATCH] Add zeitgeist activity logging
  static void
  mark_desktop_file_executable (CommonJob    *common,
                                GCancellable *cancellable,
-@@ -2355,6 +2463,37 @@ delete_task_done (GObject      *source_o
+@@ -2364,6 +2472,37 @@ delete_task_done (GObject      *source_object,
  
      job = user_data;
  
@@ -187,7 +190,7 @@ Subject: [PATCH] Add zeitgeist activity logging
      g_list_free_full (job->files, g_object_unref);
  
      if (job->done_callback)
-@@ -5776,6 +5915,25 @@ copy_task_done (GObject      *source_obj
+@@ -5698,6 +5837,25 @@ copy_task_done (GObject      *source_object,
                              job->done_callback_data);
      }
  
@@ -213,7 +216,7 @@ Subject: [PATCH] Add zeitgeist activity logging
      g_list_free_full (job->files, g_object_unref);
      if (job->destination)
      {
-@@ -6422,6 +6580,20 @@ move_task_done (GObject      *source_obj
+@@ -6394,6 +6552,20 @@ move_task_done (GObject      *source_object,
                              job->done_callback_data);
      }
  
@@ -234,7 +237,7 @@ Subject: [PATCH] Add zeitgeist activity logging
      g_list_free_full (job->files, g_object_unref);
      g_object_unref (job->destination);
      g_hash_table_unref (job->debuting_files);
-@@ -6807,6 +6979,25 @@ link_task_done (GObject      *source_obj
+@@ -6779,6 +6951,25 @@ link_task_done (GObject      *source_object,
                              job->done_callback_data);
      }
  
@@ -260,7 +263,7 @@ Subject: [PATCH] Add zeitgeist activity logging
      g_list_free_full (job->files, g_object_unref);
      g_object_unref (job->destination);
      g_hash_table_unref (job->debuting_files);
-@@ -7310,6 +7501,13 @@ create_task_done (GObject      *source_o
+@@ -7282,6 +7473,13 @@ create_task_done (GObject      *source_object,
                              job->done_callback_data);
      }
  
@@ -274,19 +277,21 @@ Subject: [PATCH] Add zeitgeist activity logging
      g_object_unref (job->dest_dir);
      if (job->src)
      {
+diff --git a/src/nautilus-file.c b/src/nautilus-file.c
+index 3a7c9a4..3f6a69f 100644
 --- a/src/nautilus-file.c
 +++ b/src/nautilus-file.c
-@@ -85,6 +85,9 @@
+@@ -87,6 +87,9 @@
  
  #define MEGA_TO_BASE_RATE 1048576
-
+ 
 +#include <zeitgeist.h>
 +#define ZEITGEIST_NAUTILUS_ACTOR "application://nautilus.desktop"
 +
  /* Files that start with these characters sort after files that don't. */
  #define SORT_LAST_CHAR1 '.'
  #define SORT_LAST_CHAR2 '#'
-@@ -1980,6 +1983,29 @@ rename_get_info_callback (GObject      *
+@@ -1992,6 +1995,29 @@ rename_get_info_callback (GObject      *source_object,
          update_info_and_name (op->file, new_info);
  
          new_uri = nautilus_file_get_uri (op->file);
@@ -316,9 +321,11 @@ Subject: [PATCH] Add zeitgeist activity logging
          nautilus_directory_moved (old_uri, new_uri);
          g_free (new_uri);
          g_free (old_uri);
+diff --git a/test/meson.build b/test/meson.build
+index f6ad5b0..5f8a1ea 100644
 --- a/test/meson.build
 +++ b/test/meson.build
-@@ -16,6 +16,10 @@ test_file_utilities_get_common_filename_
+@@ -16,6 +16,10 @@ test_file_utilities_get_common_filename_prefix = executable ('test-file-utilitie
                                                               'test-file-utilities-get-common-filename-prefix.c',
                                                               dependencies: libnautilus_dep)
  
@@ -329,12 +336,15 @@ Subject: [PATCH] Add zeitgeist activity logging
  test_eel_string_get_common_prefix = executable ('test-eel-string-get-common-prefix',
                                                  'test-eel-string-get-common-prefix.c',
                                                  dependencies: libnautilus_dep)
-@@ -23,4 +27,5 @@ test_eel_string_get_common_prefix = exec
+@@ -23,4 +27,5 @@ test_eel_string_get_common_prefix = executable ('test-eel-string-get-common-pref
  test ('test-nautilus-search-engine', test_nautilus_search_engine)
  test ('test-nautilus-directory-async', test_nautilus_directory_async)
  test ('test-file-utilities-get-common-filename-prefix', test_file_utilities_get_common_filename_prefix)
 +test ('test-nautilus-zeitgeist', test_nautilus_zeitgeist)
  test ('test-eel-string-get-common-prefix', test_eel_string_get_common_prefix)
+diff --git a/test/run-zeitgeist-test.sh b/test/run-zeitgeist-test.sh
+new file mode 100644
+index 0000000..1f3ab19
 --- /dev/null
 +++ b/test/run-zeitgeist-test.sh
 @@ -0,0 +1,50 @@
@@ -388,6 +398,9 @@ Subject: [PATCH] Add zeitgeist activity logging
 +echo "Cleaning up..."
 +zeitgeist-daemon --quit
 +rm -r "${TMP_PATH}"
+diff --git a/test/test-nautilus-zeitgeist.c b/test/test-nautilus-zeitgeist.c
+new file mode 100644
+index 0000000..b0fea03
 --- /dev/null
 +++ b/test/test-nautilus-zeitgeist.c
 @@ -0,0 +1,343 @@
diff --git a/meson.build b/meson.build
index 18e645a..0b8a6f1 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project ('nautilus', 'c',
-         version: '3.26.3',
+         version: '3.26.4',
          meson_version: '>=0.40.0',
          license: 'GPL3+')
 
diff --git a/org.gnome.Nautilus.json b/org.gnome.Nautilus.json
 deleted file mode 100644
index 2ed1cbc..0000000
--- a/org.gnome.Nautilus.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-    "app-id": "org.gnome.Nautilus",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "master",
-    "sdk": "org.gnome.Sdk",
-    "command": "nautilus",
-    "tags": ["devel", "development", "nightly"],
-    "desktop-file-name-prefix": "(Development) ",
-    "finish-args": [
-        "--share=ipc", "--socket=x11",
-        "--socket=wayland",
-        "--talk-name=org.gnome.OnlineAccounts",
-        "--talk-name=org.freedesktop.Tracker1",
-        "--filesystem=home",
-        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*",
-        "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro",
-        "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
-    ],
-    "build-options" : {
-        "cflags": "-Wno-deprecated-declarations -Og",
-        "cxxflags": "-Wno-deprecated-declarations -Og"
-    },
-    "cleanup": [ "/include", "/share/bash-completion" ],
-    "modules": [
-        {
-            "name": "libexif",
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://downloads.sourceforge.net/libexif/libexif-0.6.21.tar.bz2",
-                    "sha256": "16cdaeb62eb3e6dfab2435f7d7bccd2f37438d21c5218ec4e58efa9157d4d41a"
-                },
-                {
-                    "type": "shell",
-                    "commands": [
-                        "cp -f /usr/share/gnu-config/config.sub .",
-                        "cp -f /usr/share/gnu-config/config.guess ."
-                    ]
-                }
-            ]
-        },
-        {
-            "name": "exempi",
-            "config-opts": [
-                "--disable-unittest"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://anongit.freedesktop.org/git/exempi.git"
-                }
-            ]
-
-        },
-        {
-            "name": "tracker",
-            "cleanup": [ "/bin", "/etc", "/libexec" ],
-            "config-opts": [ "--disable-miner-apps", "--disable-static",
-                             "--disable-tracker-extract", "--disable-tracker-needle",
-                             "--disable-tracker-preferences", "--disable-artwork",
-                             "--disable-tracker-writeback", "--disable-miner-user-guides",
-                             "--with-bash-completion-dir=no" ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://git.gnome.org/browse/tracker"
-                }
-            ]
-        },
-        {
-            "name": "gnome-desktop",
-            "config-opts": ["--disable-debug-tools", "--disable-udev"],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://git.gnome.org/browse/gnome-desktop"
-                }
-            ]
-        },
-        {
-            "name": "gnome-autoar",
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://git.gnome.org/browse/gnome-autoar"
-                }
-            ]
-        },
-        {
-            "buildsystem": "meson",
-            "builddir": true,
-            "name": "nautilus",
-            "config-opts": [
-                "-Denable-desktop=false",
-                "-Denable-selinux=false",
-                "-Denable-xmp=true",
-                "-Denable-exif=true",
-                "--libdir=/app/lib"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/nautilus.git"
-                }
-            ]
-        }
-    ]
-}
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e10497e..60df1bc 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,9 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nautilus 3.1.90\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
-"product=nautilus&keywords=I18N+L10N&component=Internationalization (i18n)\n"
-"POT-Creation-Date: 2017-09-08 11:04+0000\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/nautilus/issues\n"
+"POT-Creation-Date: 2018-01-05 19:22+0000\n"
 "PO-Revision-Date: 2017-09-12 01:44+0800\n"
 "Last-Translator: Cheng-Chia Tseng <[e-mail]>\n"
 "Language-Team: Chinese(Taiwan) <[e-mail]>\n"
@@ -694,8 +693,8 @@ msgstr "顯示更多訊息(_D)"
 #. Add buttons
 #: eel/eel-stock-dialogs.c:204 src/nautilus-file-conflict-dialog.c:325
 #: src/nautilus-file-operations.c:225 src/nautilus-files-view.c:1114
-#: src/nautilus-files-view.c:1635 src/nautilus-files-view.c:5941
-#: src/nautilus-files-view.c:6445 src/nautilus-location-entry.c:282
+#: src/nautilus-files-view.c:1635 src/nautilus-files-view.c:5947
+#: src/nautilus-files-view.c:6451 src/nautilus-location-entry.c:282
 #: src/nautilus-mime-actions.c:564 src/nautilus-mime-actions.c:568
 #: src/nautilus-mime-actions.c:650 src/nautilus-mime-actions.c:956
 #: src/nautilus-mime-actions.c:1508 src/nautilus-properties-window.c:4577
@@ -726,7 +725,7 @@ msgid "Unable to rename desktop icon"
 msgstr "無法重新命名桌面圖示"
 
 #: nautilus-desktop/nautilus-desktop-link.c:142 src/nautilus-bookmark.c:116
-#: src/nautilus-file-utilities.c:304 src/nautilus-list-view.c:1739
+#: src/nautilus-file-utilities.c:304 src/nautilus-list-view.c:1742
 #: src/nautilus-pathbar.c:449 src/nautilus-shell-search-provider.c:315
 #: src/nautilus-window.c:193
 msgid "Home"
@@ -1015,7 +1014,7 @@ msgstr "重設為預設值(_F)"
 msgid "Replace the current List Columns settings with the default settings"
 msgstr "使用預設設定值取代目前的清單欄設定值"
 
-#: src/nautilus-column-utilities.c:57 src/nautilus-list-view.c:1986
+#: src/nautilus-column-utilities.c:57 src/nautilus-list-view.c:1989
 #: src/resources/ui/nautilus-rename-file-popover.ui:14
 msgid "Name"
 msgstr "名稱"
@@ -1990,7 +1989,7 @@ msgid "Do _not Empty Trash"
 msgstr "不要清空回收筒(_N)"
 
 #. Translators: %s is a file name formatted for display
-#: src/nautilus-file-operations.c:2909 src/nautilus-files-view.c:6674
+#: src/nautilus-file-operations.c:2909 src/nautilus-files-view.c:6680
 #, c-format
 msgid "Unable to access “%s”"
 msgstr "無法存取 「%s」"
@@ -2518,8 +2517,8 @@ msgstr "確定(_O)"
 msgid "Select Items Matching"
 msgstr "選擇項目比對"
 
-#: src/nautilus-files-view.c:1637 src/nautilus-files-view.c:5942
-#: src/nautilus-files-view.c:6446
+#: src/nautilus-files-view.c:1637 src/nautilus-files-view.c:5948
+#: src/nautilus-files-view.c:6452
 msgid "_Select"
 msgstr "選擇(_S)"
 
@@ -2596,109 +2595,109 @@ msgstr "(%s)"
 msgid "%s %s, %s %s"
 msgstr "%s %s, %s %s"
 
-#: src/nautilus-files-view.c:5929
+#: src/nautilus-files-view.c:5935
 msgid "Select Move Destination"
 msgstr "選擇移動的目的地"
 
-#: src/nautilus-files-view.c:5933
+#: src/nautilus-files-view.c:5939
 msgid "Select Copy Destination"
 msgstr "選擇複製的目的地"
 
-#: src/nautilus-files-view.c:6442
+#: src/nautilus-files-view.c:6448
 msgid "Select Extract Destination"
 msgstr "選擇解開的目的地"
 
 #. Translators: %s is a file name formatted for display
-#: src/nautilus-files-view.c:6702
+#: src/nautilus-files-view.c:6708
 #, c-format
 msgid "Unable to remove “%s”"
 msgstr "無法移除「%s」"
 
 #. Translators: %s is a file name formatted for display
-#: src/nautilus-files-view.c:6730
+#: src/nautilus-files-view.c:6736
 #, c-format
 msgid "Unable to eject “%s”"
 msgstr "無法退出「%s」"
 
-#: src/nautilus-files-view.c:6753
+#: src/nautilus-files-view.c:6759
 msgid "Unable to stop drive"
 msgstr "無法停止裝置"
 
 #. Translators: %s is a file name formatted for display
-#: src/nautilus-files-view.c:6865
+#: src/nautilus-files-view.c:6871
 #, c-format
 msgid "Unable to start “%s”"
 msgstr "無法啟動「%s」"
 
-#: src/nautilus-files-view.c:7776
+#: src/nautilus-files-view.c:7782
 #, c-format
 msgid "New Folder with Selection (%'d Item)"
 msgid_plural "New Folder with Selection (%'d Items)"
 msgstr[0] "以選取範圍新增資料夾 (%'d 個項目)"
 
-#: src/nautilus-files-view.c:7836
+#: src/nautilus-files-view.c:7842
 #, c-format
 msgid "Open With %s"
 msgstr "以 %s 開啟"
 
-#: src/nautilus-files-view.c:7848
+#: src/nautilus-files-view.c:7854
 msgid "Run"
 msgstr "執行"
 
-#: src/nautilus-files-view.c:7853
+#: src/nautilus-files-view.c:7859
 msgid "Extract Here"
 msgstr "在此處解開"
 
-#: src/nautilus-files-view.c:7854
+#: src/nautilus-files-view.c:7860
 msgid "Extract to…"
 msgstr "解開到…"
 
-#: src/nautilus-files-view.c:7858
+#: src/nautilus-files-view.c:7864
 msgid "Open"
 msgstr "開啟"
 
-#: src/nautilus-files-view.c:7915
+#: src/nautilus-files-view.c:7921
 #: src/resources/ui/nautilus-files-view-context-menus.ui:125
 msgid "_Start"
 msgstr "開啟(_S)"
 
-#: src/nautilus-files-view.c:7921 src/gtk/nautilusgtkplacesview.c:1685
+#: src/nautilus-files-view.c:7927 src/gtk/nautilusgtkplacesview.c:1685
 msgid "_Connect"
 msgstr "連接(_C)"
 
-#: src/nautilus-files-view.c:7927
+#: src/nautilus-files-view.c:7933
 msgid "_Start Multi-disk Drive"
 msgstr "開啟多磁碟裝置(_S)"
 
-#: src/nautilus-files-view.c:7933
+#: src/nautilus-files-view.c:7939
 msgid "U_nlock Drive"
 msgstr "解鎖裝置(_N)"
 
-#: src/nautilus-files-view.c:7953
+#: src/nautilus-files-view.c:7959
 msgid "Stop Drive"
 msgstr "停止裝置"
 
-#: src/nautilus-files-view.c:7959
+#: src/nautilus-files-view.c:7965
 msgid "_Safely Remove Drive"
 msgstr "安全的移除裝置(_S)"
 
-#: src/nautilus-files-view.c:7965 src/gtk/nautilusgtkplacesview.c:1675
+#: src/nautilus-files-view.c:7971 src/gtk/nautilusgtkplacesview.c:1675
 msgid "_Disconnect"
 msgstr "中斷(_D)"
 
-#: src/nautilus-files-view.c:7971
+#: src/nautilus-files-view.c:7977
 msgid "_Stop Multi-disk Drive"
 msgstr "關閉多磁碟裝置(_S)"
 
-#: src/nautilus-files-view.c:7977
+#: src/nautilus-files-view.c:7983
 msgid "_Lock Drive"
 msgstr "鎖定裝置(_L)"
 
-#: src/nautilus-files-view.c:9660
+#: src/nautilus-files-view.c:9666
 msgid "Content View"
 msgstr "內容顯示模式"
 
-#: src/nautilus-files-view.c:9661
+#: src/nautilus-files-view.c:9667
 msgid "View of the current folder"
 msgstr "顯示目前的資料夾"
 
@@ -3326,18 +3325,18 @@ msgstr "(空的)"
 msgid "Use Default"
 msgstr "使用預設值"
 
-#: src/nautilus-list-view.c:2114
+#: src/nautilus-list-view.c:2117
 #: src/resources/ui/nautilus-preferences-window.ui:90
 #: src/resources/ui/nautilus-preferences-window.ui:1162
 msgid "List View"
 msgstr "清單檢視"
 
-#: src/nautilus-list-view.c:3023
+#: src/nautilus-list-view.c:3026
 #, c-format
 msgid "%s Visible Columns"
 msgstr "%s 可視欄位"
 
-#: src/nautilus-list-view.c:3043
+#: src/nautilus-list-view.c:3046
 msgid "Choose the order of information to appear in this folder:"
 msgstr "請選擇這個資料夾顯示資訊的次序："
 
@@ -3419,7 +3418,7 @@ msgstr "要執行「%s」，還是顯示它的內容？"
 #: src/nautilus-mime-actions.c:641
 #, c-format
 msgid "“%s” is an executable text file."
-msgstr "「%s」不是可執行的文字檔。"
+msgstr "「%s」是可執行的文字檔。"
 
 #: src/nautilus-mime-actions.c:647
 msgid "Run in _Terminal"
@@ -4190,49 +4189,49 @@ msgstr "清空(_E)"
 msgid "Delete all items in the Trash"
 msgstr "刪除回收筒中的所有項目"
 
-#: src/nautilus-ui-utilities.c:381
+#: src/nautilus-ui-utilities.c:307
 #, c-format
 msgid "Since %d day ago"
 msgid_plural "Since %d days ago"
 msgstr[0] "%d 天前"
 
-#: src/nautilus-ui-utilities.c:382
+#: src/nautilus-ui-utilities.c:308
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天前"
 
-#: src/nautilus-ui-utilities.c:388
+#: src/nautilus-ui-utilities.c:314
 #, c-format
 msgid "Since last week"
 msgid_plural "Since %d weeks ago"
 msgstr[0] "%d 週前"
 
-#: src/nautilus-ui-utilities.c:389
+#: src/nautilus-ui-utilities.c:315
 #, c-format
 msgid "Last week"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 週前"
 
-#: src/nautilus-ui-utilities.c:395
+#: src/nautilus-ui-utilities.c:321
 #, c-format
 msgid "Since last month"
 msgid_plural "Since %d months ago"
 msgstr[0] "%d 個月前"
 
-#: src/nautilus-ui-utilities.c:396
+#: src/nautilus-ui-utilities.c:322
 #, c-format
 msgid "Last month"
 msgid_plural "%d months ago"
 msgstr[0] "%d 個月前"
 
-#: src/nautilus-ui-utilities.c:401
+#: src/nautilus-ui-utilities.c:327
 #, c-format
 msgid "Since last year"
 msgid_plural "Since %d years ago"
 msgstr[0] "%d 年前"
 
-#: src/nautilus-ui-utilities.c:402
+#: src/nautilus-ui-utilities.c:328
 #, c-format
 msgid "Last year"
 msgid_plural "%d years ago"
diff --git a/src/gtk/gtk-code-generator.sh b/src/gtk/gtk-code-generator.sh
index c740053..b30c479 100755
--- a/src/gtk/gtk-code-generator.sh
+++ b/src/gtk/gtk-code-generator.sh
@@ -5,8 +5,8 @@
 # action.
 # Also remove/add the neccesary bits to make it work inside nautilus
 
-URL=https://git.gnome.org/browse/gtk+/plain/gtk/
-URLUI=https://git.gnome.org/browse/gtk+/plain/gtk/ui/
+URL=https://gitlab.gnome.org/GNOME/gtk/raw/gtk-3-22/gtk/
+URLUI=https://gitlab.gnome.org/GNOME/gtk/raw/gtk-3-22/gtk/ui/
 SUFIX=?h=gtk-3-22
 
 # Since comments are not allowed inside the sed line, this is what it will do
diff --git a/src/gtk/nautilusgtkplacesview.c b/src/gtk/nautilusgtkplacesview.c
index de0610e..b72085b 100644
--- a/src/gtk/nautilusgtkplacesview.c
+++ b/src/gtk/nautilusgtkplacesview.c
@@ -401,6 +401,9 @@ nautilus_gtk_places_view_destroy (GtkWidget *widget)
   if (priv->network_monitor)
     g_signal_handlers_disconnect_by_func (priv->network_monitor, update_places, widget);
 
+  if (priv->server_list_monitor)
+    g_signal_handlers_disconnect_by_func (priv->server_list_monitor, server_file_changed_cb, widget);
+
   g_cancellable_cancel (priv->cancellable);
   g_cancellable_cancel (priv->networks_fetching_cancellable);
 
@@ -1182,8 +1185,7 @@ update_places (NautilusGtkPlacesView *view)
   populate_servers (view);
 
   /* fetch networks and add them asynchronously */
-  if (!nautilus_gtk_places_view_get_local_only (view))
-    fetch_networks (view);
+  fetch_networks (view);
 
   update_view_mode (view);
   /* Check whether we still are in a loading state */
@@ -1405,6 +1407,7 @@ pulse_entry_cb (gpointer user_data)
     {
       gtk_entry_set_progress_pulse_step (GTK_ENTRY (priv->address_entry), 0.0);
       gtk_entry_set_progress_fraction (GTK_ENTRY (priv->address_entry), 0.0);
+      priv->entry_pulse_timeout_id = 0;
 
       return G_SOURCE_REMOVE;
     }
@@ -1420,7 +1423,6 @@ unmount_mount (NautilusGtkPlacesView *view,
 
   priv = nautilus_gtk_places_view_get_instance_private (view);
   toplevel = gtk_widget_get_toplevel (GTK_WIDGET (view));
-  operation = gtk_mount_operation_new (GTK_WINDOW (toplevel));
 
   g_cancellable_cancel (priv->cancellable);
   g_clear_object (&priv->cancellable);
@@ -1898,10 +1900,45 @@ on_listbox_row_activated (NautilusGtkPlacesView    *view,
                           GtkWidget        *listbox)
 {
   NautilusGtkPlacesViewPrivate *priv;
+  GdkEvent *event;
+  guint button;
+  GtkPlacesOpenFlags open_flags;
 
   priv = nautilus_gtk_places_view_get_instance_private (view);
 
-  activate_row (view, row, priv->current_open_flags);
+  event = gtk_get_current_event ();
+  gdk_event_get_button (event, &button);
+
+  if (gdk_event_get_event_type (event) == GDK_BUTTON_RELEASE && button == GDK_BUTTON_MIDDLE)
+    open_flags = GTK_PLACES_OPEN_NEW_TAB;
+  else
+    open_flags = priv->current_open_flags;
+
+  activate_row (view, row, open_flags);
+}
+
+static gboolean
+is_mount_locally_accessible (GMount *mount)
+{
+  GFile *base_file;
+  gchar *path;
+
+  if (mount == NULL)
+    return FALSE;
+
+  base_file = g_mount_get_root (mount);
+
+  if (base_file == NULL)
+    return FALSE;
+
+  path = g_file_get_path (base_file);
+  g_object_unref (base_file);
+
+  if (path == NULL)
+    return FALSE;
+
+  g_free (path);
+  return TRUE;
 }
 
 static gboolean
@@ -1911,6 +1948,7 @@ listbox_filter_func (GtkListBoxRow *row,
   NautilusGtkPlacesViewPrivate *priv;
   gboolean is_network;
   gboolean is_placeholder;
+  gboolean is_local = FALSE;
   gboolean retval;
   gboolean searching;
   gchar *name;
@@ -1923,7 +1961,20 @@ listbox_filter_func (GtkListBoxRow *row,
   is_network = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (row), "is-network"));
   is_placeholder = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (row), "is-placeholder"));
 
-  if (is_network && priv->local_only)
+  if (NAUTILUS_IS_GTK_PLACES_VIEW_ROW (row))
+    {
+      NautilusGtkPlacesViewRow *placesviewrow;
+      GMount *mount;
+
+      placesviewrow = NAUTILUS_GTK_PLACES_VIEW_ROW (row);
+      g_object_get(G_OBJECT (placesviewrow), "mount", &mount, NULL);
+
+      is_local = is_mount_locally_accessible (mount);
+
+      g_clear_object (&mount);
+    }
+
+  if (is_network && priv->local_only && !is_local)
     return FALSE;
 
   if (is_placeholder && searching)
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 98e6f35..3ccbf54 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -159,7 +159,7 @@ check_required_directories (NautilusApplication *self)
         GString *directories_as_string;
         GSList *l;
         char *error_string;
-        const char *detail_string;
+        g_autofree char *detail_string = NULL;
         GtkDialog *dialog;
 
         ret = FALSE;
diff --git a/src/nautilus-canvas-container.c b/src/nautilus-canvas-container.c
index b85a2ad..fa28051 100644
--- a/src/nautilus-canvas-container.c
+++ b/src/nautilus-canvas-container.c
@@ -6965,6 +6965,7 @@ nautilus_canvas_container_add (NautilusCanvasContainer *container,
 void
 nautilus_canvas_container_layout_now (NautilusCanvasContainer *container)
 {
+    container->details->in_layout_now = TRUE;
     if (container->details->idle_id != 0)
     {
         unschedule_redo_layout (container);
@@ -6975,6 +6976,7 @@ nautilus_canvas_container_layout_now (NautilusCanvasContainer *container)
      * newly added files may trigger a change in the size allocation and
      * thus toggle scrollbars on */
     gtk_container_check_resize (GTK_CONTAINER (gtk_widget_get_parent (GTK_WIDGET (container))));
+    container->details->in_layout_now = FALSE;
 }
 
 /**
@@ -8241,6 +8243,10 @@ nautilus_canvas_container_accessible_icon_added_cb (NautilusCanvasContainer *con
     AtkObject *atk_parent;
     AtkObject *atk_child;
 
+    /* We don't want to emit children_changed signals during the initial load. */
+    if (!container->details->in_layout_now)
+        return;
+
     icon = g_hash_table_lookup (container->details->icon_set, icon_data);
     if (icon)
     {
diff --git a/src/nautilus-canvas-item.c b/src/nautilus-canvas-item.c
index 9767200..d1c7817 100644
--- a/src/nautilus-canvas-item.c
+++ b/src/nautilus-canvas-item.c
@@ -286,6 +286,7 @@ nautilus_canvas_item_set_property (GObject      *object,
     NautilusCanvasItem *item;
     NautilusCanvasItemDetails *details;
     AtkObject *accessible;
+    gboolean is_rename;
 
     item = NAUTILUS_CANVAS_ITEM (object);
     accessible = atk_gobject_accessible_for_object (G_OBJECT (item));
@@ -301,13 +302,15 @@ nautilus_canvas_item_set_property (GObject      *object,
                 return;
             }
 
+            is_rename = details->editable_text != NULL;
             g_free (details->editable_text);
             details->editable_text = g_strdup (g_value_get_string (value));
             if (details->text_util)
             {
                 gail_text_util_text_setup (details->text_util,
                                            details->editable_text);
-                g_object_notify (G_OBJECT (accessible), "accessible-name");
+                if (is_rename)
+                    g_object_notify (G_OBJECT (accessible), "accessible-name");
             }
 
             nautilus_canvas_item_invalidate_label_size (item);
diff --git a/src/nautilus-canvas-private.h b/src/nautilus-canvas-private.h
index 0f3ad70..0a114ba 100644
--- a/src/nautilus-canvas-private.h
+++ b/src/nautilus-canvas-private.h
@@ -235,6 +235,7 @@ struct NautilusCanvasContainerDetails {
 	guint a11y_item_action_idle_handler;
 	GQueue* a11y_item_action_queue;
 
+	eel_boolean_bit in_layout_now : 1;
 	eel_boolean_bit is_loading : 1;
 	eel_boolean_bit needs_resort : 1;
 	eel_boolean_bit selection_needs_resort : 1;
diff --git a/src/nautilus-directory.c b/src/nautilus-directory.c
index ad3bb03..19316e8 100644
--- a/src/nautilus-directory.c
+++ b/src/nautilus-directory.c
@@ -66,10 +66,14 @@ static void               set_directory_location (NautilusDirectory *directory,
 G_DEFINE_TYPE (NautilusDirectory, nautilus_directory, G_TYPE_OBJECT);
 
 static gboolean
-real_contains_file (NautilusDirectory *directory,
+real_contains_file (NautilusDirectory *self,
                     NautilusFile      *file)
 {
-    return file->details->directory == directory;
+    NautilusDirectory *directory;
+
+    directory = nautilus_file_get_directory (file);
+
+    return directory == self;
 }
 
 static gboolean
@@ -1089,7 +1093,7 @@ call_files_added_free_list (gpointer key,
 }
 
 static void
-call_files_changed_common (NautilusDirectory *directory,
+call_files_changed_common (NautilusDirectory *self,
                            GList             *file_list)
 {
     GList *node;
@@ -1097,15 +1101,18 @@ call_files_changed_common (NautilusDirectory *directory,
 
     for (node = file_list; node != NULL; node = node->next)
     {
+        NautilusDirectory *directory;
+
         file = node->data;
-        if (file->details->directory == directory)
+        directory = nautilus_file_get_directory (file);
+
+        if (directory == self)
         {
-            nautilus_directory_add_file_to_work_queue (directory,
-                                                       file);
+            nautilus_directory_add_file_to_work_queue (self, file);
         }
     }
-    nautilus_directory_async_state_changed (directory);
-    nautilus_directory_emit_change_signals (directory, file_list);
+    nautilus_directory_async_state_changed (self);
+    nautilus_directory_emit_change_signals (self, file_list);
 }
 
 static void
@@ -1292,6 +1299,10 @@ nautilus_directory_notify_files_changed (GList *files)
         file = nautilus_file_get_existing (location);
         if (file != NULL)
         {
+            NautilusDirectory *directory;
+
+            directory = nautilus_file_get_directory (file);
+
             /* Tell it to re-get info now, and later emit
              * a changed signal.
              */
@@ -1299,9 +1310,7 @@ nautilus_directory_notify_files_changed (GList *files)
             file->details->link_info_is_up_to_date = FALSE;
             nautilus_file_invalidate_extension_info_internal (file);
 
-            hash_table_list_prepend (changed_lists,
-                                     file->details->directory,
-                                     file);
+            hash_table_list_prepend (changed_lists, directory, file);
         }
     }
 
@@ -1343,11 +1352,14 @@ nautilus_directory_notify_files_removed (GList *files)
         file = nautilus_file_get_existing (location);
         if (file != NULL && !nautilus_file_rename_in_progress (file))
         {
+            NautilusDirectory *directory;
+
+            directory = nautilus_file_get_directory (file);
+
             /* Mark it gone and prepare to send the changed signal. */
             nautilus_file_mark_gone (file);
             hash_table_list_prepend (changed_lists,
-                                     file->details->directory,
-                                     nautilus_file_ref (file));
+                                     directory, nautilus_file_ref (file));
         }
         nautilus_file_unref (file);
     }
@@ -1505,10 +1517,12 @@ nautilus_directory_moved (const char *old_uri,
     list = nautilus_directory_moved_internal (old_location, new_location);
     for (node = list; node != NULL; node = node->next)
     {
+        NautilusDirectory *directory;
+
         file = NAUTILUS_FILE (node->data);
-        hash_table_list_prepend (hash,
-                                 file->details->directory,
-                                 nautilus_file_ref (file));
+        directory = nautilus_file_get_directory (file);
+
+        hash_table_list_prepend (hash, directory, nautilus_file_ref (file));
     }
     nautilus_file_list_free (list);
 
@@ -1554,14 +1568,14 @@ nautilus_directory_notify_files_moved (GList *file_pairs)
         file = nautilus_file_get_existing (to_location);
         if (file != NULL)
         {
+            NautilusDirectory *directory;
+
+            directory = nautilus_file_get_directory (file);
+
             /* Mark it gone and prepare to send the changed signal. */
             nautilus_file_mark_gone (file);
-            new_directory = file->details->directory;
-            hash_table_list_prepend (changed_lists,
-                                     new_directory,
-                                     file);
-            collect_parent_directories (parent_directories,
-                                        new_directory);
+            hash_table_list_prepend (changed_lists, directory, file);
+            collect_parent_directories (parent_directories, directory);
         }
 
         /* Update any directory objects that are affected. */
@@ -1569,10 +1583,11 @@ nautilus_directory_notify_files_moved (GList *file_pairs)
                                                             to_location);
         for (node = affected_files; node != NULL; node = node->next)
         {
+            NautilusDirectory *directory;
+
             file = NAUTILUS_FILE (node->data);
-            hash_table_list_prepend (changed_lists,
-                                     file->details->directory,
-                                     file);
+            directory = nautilus_file_get_directory (file);
+            hash_table_list_prepend (changed_lists, directory, file);
         }
         unref_list = g_list_concat (unref_list, affected_files);
 
@@ -1586,8 +1601,12 @@ nautilus_directory_notify_files_moved (GList *file_pairs)
         }
         else
         {
+            NautilusDirectory *directory;
+
+            directory = nautilus_file_get_directory (file);
+
             /* Handle notification in the old directory. */
-            old_directory = file->details->directory;
+            old_directory = directory;
             collect_parent_directories (parent_directories, old_directory);
 
             /* Cancel loading of attributes in the old directory */
diff --git a/src/nautilus-file-private.h b/src/nautilus-file-private.h
index adcfacf..cb2bebb 100644
--- a/src/nautilus-file-private.h
+++ b/src/nautilus-file-private.h
@@ -259,6 +259,8 @@ gboolean      nautilus_file_set_display_name               (NautilusFile        
 							    const char             *display_name,
 							    const char             *edit_name,
 							    gboolean                custom);
+NautilusDirectory *
+              nautilus_file_get_directory                  (NautilusFile           *file);
 void          nautilus_file_set_directory                  (NautilusFile           *file,
 							    NautilusDirectory      *directory);
 void          nautilus_file_set_mount                      (NautilusFile           *file,
diff --git a/src/nautilus-file-utilities.c b/src/nautilus-file-utilities.c
index 30dac56..e79f37b 100644
--- a/src/nautilus-file-utilities.c
+++ b/src/nautilus-file-utilities.c
@@ -623,7 +623,7 @@ nautilus_is_other_locations_directory (GFile *dir)
 GMount *
 nautilus_get_mounted_mount_for_root (GFile *location)
 {
-    GVolumeMonitor *volume_monitor;
+    g_autoptr (GVolumeMonitor) volume_monitor = NULL;
     GList *mounts;
     GList *l;
     GMount *mount;
diff --git a/src/nautilus-file.c b/src/nautilus-file.c
index fc765be..0ac5398 100644
--- a/src/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -556,6 +556,14 @@ nautilus_file_clear_info (NautilusFile *file)
     clear_metadata (file);
 }
 
+NautilusDirectory *
+nautilus_file_get_directory (NautilusFile *file)
+{
+    g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL);
+
+    return file->details->directory;
+}
+
 void
 nautilus_file_set_directory (NautilusFile      *file,
                              NautilusDirectory *directory)
@@ -2164,7 +2172,14 @@ nautilus_file_can_rename_file (NautilusFile                  *file,
             g_error_free (error);
             return NULL;
         }
-        new_file_name = g_strdup_printf ("%s.desktop", new_name);
+
+        /* Only append `.desktop` if it doesn't already exist. */
+        if (g_str_has_suffix (new_name, ".desktop")) {
+            new_file_name = g_strdup (new_name);
+        } else {
+            new_file_name = g_strdup_printf ("%s.desktop", new_name);
+        }
+
         new_file_name = g_strdelimit (new_file_name, "/", '-');
 
         if (name_is (file, new_file_name))
@@ -5496,7 +5511,7 @@ nautilus_thumbnail_is_limited_by_zoom (int size,
 
     zoom_level = size * scale;
 
-    if (zoom_level <= NAUTILUS_LIST_ICON_SIZE_STANDARD)
+    if (zoom_level <= NAUTILUS_LIST_ICON_SIZE_SMALL)
     {
         return TRUE;
     }
@@ -8566,10 +8581,31 @@ nautilus_file_emit_changed (NautilusFile *file)
     link_files = get_link_files (file);
     for (p = link_files; p != NULL; p = p->next)
     {
-        if (p->data != file)
+        /* Looking for directly recursive links. */
+        GList *link_targets = NULL;
+        NautilusDirectory *directory;
+
+        if (p->data == file)
         {
-            nautilus_file_changed (NAUTILUS_FILE (p->data));
+            continue;
         }
+
+        link_targets = get_link_files (p->data);
+        directory = nautilus_file_get_directory (p->data);
+
+        /* Reiterating (heh) that this will break with more complex cycles.
+         * Users, stop trying to break things on purpose.
+         */
+        if (g_list_find (link_targets, file) != NULL &&
+            directory == nautilus_file_get_directory (file))
+        {
+            g_signal_emit (p->data, signals[CHANGED], 0, p->data);
+            nautilus_file_list_free (link_targets);
+            continue;
+        }
+
+        nautilus_file_changed (NAUTILUS_FILE (p->data));
+        nautilus_file_list_free (link_targets);
     }
     nautilus_file_list_free (link_files);
 }
diff --git a/src/nautilus-file.h b/src/nautilus-file.h
index 3a83bd4..5b319f9 100644
--- a/src/nautilus-file.h
+++ b/src/nautilus-file.h
@@ -149,6 +149,8 @@ NautilusFile *          nautilus_file_get_existing_by_uri               (const c
 NautilusFile *          nautilus_file_ref                               (NautilusFile                   *file);
 void                    nautilus_file_unref                             (NautilusFile                   *file);
 
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (NautilusFile, nautilus_file_unref)
+
 /* Monitor the file. */
 void                    nautilus_file_monitor_add                       (NautilusFile                   *file,
 									 gconstpointer                   client,
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 9b7b9b9..8784f63 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -2047,8 +2047,9 @@ static void
 nautilus_files_view_new_folder_dialog_new (NautilusFilesView *view,
                                            gboolean           with_selection)
 {
-    g_autoptr (NautilusDirectory) containing_directory = NULL;
+    NautilusDirectory *containing_directory;
     NautilusFilesViewPrivate *priv;
+    GList *selection;
     g_autofree char *uri = NULL;
     g_autofree char *common_prefix = NULL;
 
@@ -2062,13 +2063,8 @@ nautilus_files_view_new_folder_dialog_new (NautilusFilesView *view,
     uri = nautilus_files_view_get_backing_uri (view);
     containing_directory = nautilus_directory_get_by_uri (uri);
 
-    if (with_selection)
-    {
-        GList *selection;
-        selection = nautilus_view_get_selection (NAUTILUS_VIEW (view));
-        common_prefix = nautilus_get_common_filename_prefix (selection, MIN_COMMON_FILENAME_PREFIX_LENGTH);
-        nautilus_file_list_free (selection);
-    }
+    selection = nautilus_view_get_selection (NAUTILUS_VIEW (view));
+    common_prefix = nautilus_get_common_filename_prefix (selection, MIN_COMMON_FILENAME_PREFIX_LENGTH);
 
     priv->new_folder_controller =
         nautilus_new_folder_dialog_controller_new (nautilus_files_view_get_containing_window (view),
@@ -2084,6 +2080,9 @@ nautilus_files_view_new_folder_dialog_new (NautilusFilesView *view,
                       "cancelled",
                       (GCallback) new_folder_dialog_controller_on_cancelled,
                       view);
+
+    nautilus_file_list_free (selection);
+    nautilus_directory_unref (containing_directory);
 }
 
 typedef struct
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index 9c168f9..2a0dfcd 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -592,16 +592,9 @@ button_press_callback (GtkWidget      *widget,
                     nautilus_file_unref (file);
                 }
             }
-            else
+            else if ((event->button == GDK_BUTTON_PRIMARY || event->button == GDK_BUTTON_SECONDARY))
             {
-                if ((event->button == 1 || event->button == 3))
-                {
-                    activate_selected_items (view);
-                }
-                else if (event->button == 2)
-                {
-                    activate_selected_items_alternate (view, NULL, TRUE);
-                }
+                activate_selected_items (view);
             }
         }
         else
@@ -695,6 +688,19 @@ button_press_callback (GtkWidget      *widget,
         {
             do_popup_menu (widget, view, event);
         }
+
+        /* Don't open a new tab if we are in single click mode (this would open 2 tabs),
+         * or if CTRL or SHIFT is pressed.
+         */
+        if (event->button == GDK_BUTTON_MIDDLE &&
+            get_click_policy () != NAUTILUS_CLICK_POLICY_SINGLE &&
+            !button_event_modifies_selection (event))
+        {
+            gtk_tree_selection_unselect_all (selection);
+            gtk_tree_selection_select_path (selection, path);
+
+            activate_selected_items_alternate (view, NULL, TRUE);
+        }
     }
 
     gtk_tree_path_free (path);
diff --git a/src/nautilus-notebook.c b/src/nautilus-notebook.c
index f2b3fbd..6e1db52 100644
--- a/src/nautilus-notebook.c
+++ b/src/nautilus-notebook.c
@@ -88,14 +88,11 @@ find_tab_num_at_pos (NautilusNotebook *notebook,
                      gint              abs_x,
                      gint              abs_y)
 {
-    GtkPositionType tab_pos;
     int page_num = 0;
     GtkNotebook *nb = GTK_NOTEBOOK (notebook);
     GtkWidget *page;
     GtkAllocation allocation;
 
-    tab_pos = gtk_notebook_get_tab_pos (GTK_NOTEBOOK (notebook));
-
     while ((page = gtk_notebook_get_nth_page (nb, page_num)))
     {
         GtkWidget *tab;
@@ -118,15 +115,7 @@ find_tab_num_at_pos (NautilusNotebook *notebook,
         max_x = x_root + allocation.x + allocation.width;
         max_y = y_root + allocation.y + allocation.height;
 
-        if (((tab_pos == GTK_POS_TOP)
-             || (tab_pos == GTK_POS_BOTTOM))
-            && (abs_x <= max_x))
-        {
-            return page_num;
-        }
-        else if (((tab_pos == GTK_POS_LEFT)
-                  || (tab_pos == GTK_POS_RIGHT))
-                 && (abs_y <= max_y))
+        if (abs_x <= max_x && abs_y <= max_y)
         {
             return page_num;
         }
@@ -154,7 +143,7 @@ button_press_cb (NautilusNotebook *notebook,
             /* consume event, so that we don't pop up the context menu when
              * the mouse if not over a tab label
              */
-            return TRUE;
+            return GDK_EVENT_STOP;
         }
 
         /* switch to the page the mouse is over, but don't consume the event */
@@ -165,11 +154,16 @@ button_press_cb (NautilusNotebook *notebook,
     {
         GtkWidget *slot;
 
+        if (tab_clicked == -1)
+        {
+            return GDK_EVENT_PROPAGATE;
+        }
+
         slot = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), tab_clicked);
         g_signal_emit (notebook, signals[TAB_CLOSE_REQUEST], 0, slot);
     }
 
-    return FALSE;
+    return GDK_EVENT_PROPAGATE;
 }
 
 static void
diff --git a/src/nautilus-trash-monitor.c b/src/nautilus-trash-monitor.c
index 97f4874..1e156e1 100644
--- a/src/nautilus-trash-monitor.c
+++ b/src/nautilus-trash-monitor.c
@@ -29,7 +29,7 @@
 #include <gio/gio.h>
 #include <string.h>
 
-#define UPDATE_RATE_SECONDS 5
+#define UPDATE_RATE_SECONDS 1
 
 struct NautilusTrashMonitorDetails
 {
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index a9911ee..7b27244 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -1592,11 +1592,7 @@ handle_regular_file_if_needed (NautilusWindowSlot *self,
     if ((parent_file != NULL) &&
         nautilus_file_get_file_type (file) == G_FILE_TYPE_REGULAR)
     {
-        if (priv->pending_selection != NULL)
-        {
-            nautilus_file_list_free (priv->pending_selection);
-        }
-
+        g_clear_pointer (&priv->pending_selection, nautilus_file_list_free);
         g_clear_object (&priv->pending_location);
         g_clear_object (&priv->pending_file_to_activate);
         g_free (priv->pending_scroll_to);
@@ -2793,6 +2789,8 @@ nautilus_window_slot_dispose (GObject *object)
 
     nautilus_window_slot_remove_extra_location_widgets (self);
 
+    nautilus_window_slot_set_active (self, FALSE);
+
     if (priv->content_view)
     {
         gtk_widget_destroy (GTK_WIDGET (priv->content_view));
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 9eaae35..0bff4e0 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -2284,6 +2284,12 @@ nautilus_window_initialize_actions (NautilusWindow *window)
         "<ctrl>r",
         NULL
     };
+    const gchar *prompt_home_location_accels[] =
+    {
+        "asciitilde",
+        "dead_tilde",
+        NULL
+    };
 
     g_action_map_add_action_entries (G_ACTION_MAP (window),
                                      win_entries, G_N_ELEMENTS (win_entries),
@@ -2310,7 +2316,8 @@ nautilus_window_initialize_actions (NautilusWindow *window)
     nautilus_application_set_accelerator (app, "win.tab-move-left", "<shift><control>Page_Up");
     nautilus_application_set_accelerator (app, "win.tab-move-right", "<shift><control>Page_Down");
     nautilus_application_set_accelerator (app, "win.prompt-root-location", "slash");
-    nautilus_application_set_accelerator (app, "win.prompt-home-location", "asciitilde");
+    /* Support keyboard layouts which have a dead tilde key but not a tilde key. */
+    nautilus_application_set_accelerators (app, "win.prompt-home-location", prompt_home_location_accels);
     nautilus_application_set_accelerator (app, "win.view-menu", "F10");
     nautilus_application_set_accelerator (app, "win.restore-tab", "<shift><control>t");