Merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master

[Marco Trevisan (Treviño)]

Re-added a patch that disappeared on rebase, added one more fix.

[Sebastien Bacher (seb128)]

looks fine to me, thanks!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 47f5ac4..9f61c50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+nautilus (1:3.26.4-0ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/patches/nautilusgtkplacesview-show-error-if-volume-is-not-mo.patch:
+    - don't crash if selecting a volume that is not mounted (LP: #1764779)
+    + patch re-added after gbp deleted on importing new upstream release
+  * 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/query-add-recursive-flags-and-use-it-in-search-engines.patch:
+    - Apply the upstream version of it (with 3.26 changes)
+  * debian/patches/0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch,
+    debian/patches/0018-search-engine-add-locate-based-search-engine.patch,
+    debian/patches/file-view-Always-unset-pending_selection-after-freeing-it.patch,
+    - Refresh as per recursive-query patch update
+  * 0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch:
+    - Refresh with upstream merged-description
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Thu, 26 Jul 2018 03:22:41 +0200
+
 nautilus (1:3.26.4-0ubuntu1) cosmic; urgency=medium
 
   * New upstream release: 3.26.4 (LP: #1782681, LP: #1765776)
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 9011e04..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,9 +1,19 @@
 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-search-engine-recent.c | 427 ++++++++++++++++++++++++++++++++++++
@@ -502,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 a545160..68b6a4d 100644
+index 3a0c9d4..793b831 100644
 --- a/src/nautilus-search-engine.c
 +++ b/src/nautilus-search-engine.c
-@@ -21,6 +21,7 @@
- 
- #include <config.h>
- #include "nautilus-search-engine.h"
-+#include "nautilus-search-engine-recent.h"
+@@ -30,11 +30,13 @@
+ #define DEBUG_FLAG NAUTILUS_DEBUG_SEARCH
+ #include "nautilus-debug.h"
  #include "nautilus-search-engine-simple.h"
- #include "nautilus-search-engine-private.h"
++#include "nautilus-search-engine-recent.h"
+ #include "nautilus-search-engine-tracker.h"
  
-@@ -35,6 +36,7 @@
  typedef struct
  {
      NautilusSearchEngineTracker *tracker;
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 c0d37b9..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
@@ -678,17 +678,17 @@ index 0000000..ac5e3fc
 +
 +#endif /* __NAUTILUS_SEARCH_ENGINE_LOCATE_H__ */
 diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c
-index 68b6a4d..84a88fa 100644
+index 793b831..902d483 100644
 --- a/src/nautilus-search-engine.c
 +++ b/src/nautilus-search-engine.c
-@@ -22,6 +22,7 @@
- #include <config.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-private.h"
- 
+ #include "nautilus-search-engine-recent.h"
+ #include "nautilus-search-engine-tracker.h"
 @@ -37,6 +38,7 @@ typedef struct
  {
      NautilusSearchEngineTracker *tracker;
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/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
index 641fab5..fddae3e 100644
--- 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
@@ -1,32 +1,36 @@
 From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
-Date: Tue, 17 Jul 2018 02:35:20 +0200
+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       |  5 ++-
+ 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          | 61 +++++++++++++++++-------------
+ 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 | 34 +++++++++++++++++
- src/nautilus-search-engine-simple.c  | 72 ++++++++----------------------------
+ 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.c         | 36 +++++++++++++-----
  src/nautilus-search-engine.h         |  2 -
- src/nautilus-shell-search-provider.c | 40 +++++++++++---------
- src/nautilus-window-slot.c           | 19 ++++------
+ 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 +-
- 21 files changed, 222 insertions(+), 167 deletions(-)
+ 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
@@ -80,19 +84,18 @@ index 9cb32c8..47adcc4 100644
  
  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..b519e20 100644
+index 05a87e3..a1a27de 100644
 --- a/src/nautilus-directory-async.c
 +++ b/src/nautilus-directory-async.c
-@@ -4383,6 +4383,8 @@ got_filesystem_info (FilesystemInfoState *state,
+@@ -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);
++        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 +4467,8 @@ filesystem_info_start (NautilusDirectory *directory,
+@@ -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 ","
@@ -116,6 +119,84 @@ index cb2bebb..5f6b209 100644
  
  	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
@@ -176,108 +257,47 @@ index 5b319f9..54fdcb3 100644
  
  /* Permissions. */
 diff --git a/src/nautilus-query-editor.c b/src/nautilus-query-editor.c
-index 94b9c4d..f5260c9 100644
+index 94b9c4d..8398ad4 100644
 --- a/src/nautilus-query-editor.c
 +++ b/src/nautilus-query-editor.c
-@@ -80,33 +80,47 @@ static void nautilus_query_editor_changed (NautilusQueryEditor *editor);
- 
- G_DEFINE_TYPE_WITH_PRIVATE (NautilusQueryEditor, nautilus_query_editor, GTK_TYPE_SEARCH_BAR);
- 
--static gboolean
--settings_search_is_recursive (NautilusQueryEditor *editor)
-+static NautilusQueryRecursive
-+settings_search_get_recursive (void)
-+{
-+    switch (g_settings_get_enum (nautilus_preferences, "recursive-search"))
-+    {
-+        case NAUTILUS_SPEED_TRADEOFF_ALWAYS:
-+            return NAUTILUS_QUERY_RECURSIVE_ALWAYS;
-+        case NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY:
-+            return NAUTILUS_QUERY_RECURSIVE_LOCAL_ONLY;
-+        case NAUTILUS_SPEED_TRADEOFF_NEVER:
-+            return NAUTILUS_QUERY_RECURSIVE_NEVER;
-+    }
-+
-+    return NAUTILUS_QUERY_RECURSIVE_ALWAYS;
-+}
-+
-+static NautilusQueryRecursive
-+settings_search_get_recursive_for_location (NautilusQueryEditor *editor)
- {
-     NautilusQueryEditorPrivate *priv;
--    NautilusFile *file;
--    gboolean recursive;
-+    NautilusQueryRecursive recursive;
- 
-     priv = nautilus_query_editor_get_instance_private (editor);
-+    recursive = settings_search_get_recursive ();
- 
--    if (!priv->location)
-+    if (priv->location == NULL)
-     {
--        return TRUE;
-+        return recursive;
-     }
- 
--    file = nautilus_file_get (priv->location);
--
--    if (nautilus_file_is_remote (file))
-+    if (recursive == NAUTILUS_QUERY_RECURSIVE_LOCAL_ONLY)
-     {
--        recursive = g_settings_get_enum (nautilus_preferences, "recursive-search") == NAUTILUS_SPEED_TRADEOFF_ALWAYS;
--    }
--    else
--    {
--        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;
--    }
-+        NautilusFile *file = nautilus_file_get (priv->location);
- 
--    nautilus_file_unref (file);
-+        if (nautilus_file_is_remote (file))
-+        {
-+            recursive = NAUTILUS_QUERY_RECURSIVE_NEVER;
-+        }
-+
-+        nautilus_file_unref (file);
-+    }
- 
-     return recursive;
- }
-@@ -144,12 +158,12 @@ update_information_label (NautilusQueryEditor *editor)
+@@ -144,12 +144,12 @@ update_information_label (NautilusQueryEditor *editor)
              fts_sensitive = FALSE;
          }
          else if (nautilus_file_is_remote (file) &&
 -                 !settings_search_is_recursive (editor))
-+                 settings_search_get_recursive_for_location (editor) == NAUTILUS_QUERY_RECURSIVE_NEVER)
++                 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 (settings_search_get_recursive_for_location (editor) == NAUTILUS_QUERY_RECURSIVE_NEVER)
++        else if (location_settings_search_get_recursive_for_location (priv->location) == NAUTILUS_QUERY_RECURSIVE_NEVER)
          {
              label = _("Only searching the current folder");
          }
-@@ -171,7 +185,7 @@ recursive_search_preferences_changed (GSettings           *settings,
+@@ -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);
  
-@@ -180,7 +194,7 @@ recursive_search_preferences_changed (GSettings           *settings,
+-    if (!priv->location || !priv->query)
++    if (!priv->query)
+     {
          return;
      }
  
 -    recursive = settings_search_is_recursive (editor);
-+    recursive = settings_search_get_recursive ();
++    recursive = location_settings_search_get_recursive ();
      if (recursive != nautilus_query_get_recursive (priv->query))
      {
          nautilus_query_set_recursive (priv->query, recursive);
-@@ -382,7 +396,6 @@ create_query (NautilusQueryEditor *editor)
+@@ -382,7 +383,6 @@ create_query (NautilusQueryEditor *editor)
      NautilusQueryEditorPrivate *priv;
      NautilusQuery *query;
      NautilusFile *file;
@@ -285,7 +305,7 @@ index 94b9c4d..f5260c9 100644
      gboolean fts_enabled;
  
      priv = nautilus_query_editor_get_instance_private (editor);
-@@ -396,11 +409,9 @@ create_query (NautilusQueryEditor *editor)
+@@ -396,11 +396,13 @@ create_query (NautilusQueryEditor *editor)
  
      nautilus_query_set_search_content (query, fts_enabled);
  
@@ -294,7 +314,11 @@ index 94b9c4d..f5260c9 100644
      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);
-+    nautilus_query_set_recursive (query, settings_search_get_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);
  
@@ -437,10 +461,10 @@ index ae710f3..d86fda2 100644
      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..8e28ad7
+index 0000000..e5f989f
 --- /dev/null
 +++ b/src/nautilus-search-engine-private.h
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,31 @@
 +/*
 + * Copyright (C) 2018 Canonical Ltd.
 + *
@@ -462,8 +486,7 @@ index 0000000..8e28ad7
 + *
 + */
 +
-+#ifndef NAUTILUS_SEARCH_ENGINE_PRIVATE_H
-+#define NAUTILUS_SEARCH_ENGINE_PRIVATE_H
++#pragma once
 +
 +#include "nautilus-query.h"
 +
@@ -473,21 +496,20 @@ index 0000000..8e28ad7
 +} NautilusSearchEngineType;
 +
 +gboolean is_recursive_search (NautilusSearchEngineType engine_type, NautilusQueryRecursive recursive, GFile *location);
-+
-+#endif /* NAUTILUS_SEARCH_ENGINE_PRIVATE_H */
 diff --git a/src/nautilus-search-engine-simple.c b/src/nautilus-search-engine-simple.c
-index 3ec9eb3..0c9ea81 100644
+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-search-engine-private.h"
+-#include "nautilus-search-engine-simple.h"
  #include "nautilus-ui-utilities.h"
  #define DEBUG_FLAG NAUTILUS_DEBUG_SEARCH
  #include "nautilus-debug.h"
@@ -647,8 +669,21 @@ index 3ec9eb3..0c9ea81 100644
  
      /**
       * 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 8218ea3..98f3c79 100644
+index 4c917dd..8885ca4 100644
 --- a/src/nautilus-search-engine-tracker.c
 +++ b/src/nautilus-search-engine-tracker.c
 @@ -22,7 +22,7 @@
@@ -660,7 +695,7 @@ index 8218ea3..98f3c79 100644
  #include "nautilus-search-hit.h"
  #include "nautilus-search-provider.h"
  #define DEBUG_FLAG NAUTILUS_DEBUG_SEARCH
-@@ -296,7 +296,6 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider)
+@@ -295,7 +295,6 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider)
      GString *sparql;
      GList *mimetypes, *l;
      gint mime_count;
@@ -668,7 +703,7 @@ index 8218ea3..98f3c79 100644
      GPtrArray *date_range;
  
      tracker = NAUTILUS_SEARCH_ENGINE_TRACKER (provider);
-@@ -325,10 +324,6 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider)
+@@ -317,10 +316,6 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider)
          return;
      }
  
@@ -679,7 +714,7 @@ index 8218ea3..98f3c79 100644
      tracker->fts_enabled = nautilus_query_get_search_content (tracker->query);
  
      query_text = nautilus_query_get_text (tracker->query);
-@@ -476,16 +471,21 @@ static void
+@@ -468,13 +463,18 @@ static void
  nautilus_search_engine_tracker_set_query (NautilusSearchProvider *provider,
                                            NautilusQuery          *query)
  {
@@ -689,9 +724,6 @@ index 8218ea3..98f3c79 100644
      tracker = NAUTILUS_SEARCH_ENGINE_TRACKER (provider);
 +    location = nautilus_query_get_location (query);
  
-     if (!tracker->available)
-         return;
- 
 -    g_object_ref (query);
      g_clear_object (&tracker->query);
 -    tracker->query = query;
@@ -704,10 +736,10 @@ index 8218ea3..98f3c79 100644
  
  static gboolean
 diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c
-index 209bd4f..a545160 100644
+index 209bd4f..3a0c9d4 100644
 --- a/src/nautilus-search-engine.c
 +++ b/src/nautilus-search-engine.c
-@@ -20,12 +20,14 @@
+@@ -20,14 +20,16 @@
   */
  
  #include <config.h>
@@ -715,17 +747,20 @@ index 209bd4f..a545160 100644
 -#include <glib/gi18n.h>
 -#include "nautilus-search-provider.h"
  #include "nautilus-search-engine.h"
- #include "nautilus-search-engine-simple.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 "nautilus-file.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"
-@@ -417,12 +419,30 @@ nautilus_search_engine_get_model_provider (NautilusSearchEngine *engine)
+ 
+ typedef struct
+@@ -417,12 +419,28 @@ nautilus_search_engine_get_model_provider (NautilusSearchEngine *engine)
      return priv->model;
  }
  
@@ -751,10 +786,8 @@ index 209bd4f..a545160 100644
 +
 +        case NAUTILUS_QUERY_RECURSIVE_LOCAL_ONLY:
 +        {
-+            NautilusFile *file = nautilus_file_get (location);
-+            gboolean remote = !nautilus_file_is_remote (file);
-+            nautilus_file_unref (file);
-+            return remote;
++            g_autoptr (NautilusFile) file = nautilus_file_get (location);
++            return !nautilus_file_is_remote (file);
 +        }
 +    }
  
@@ -775,10 +808,10 @@ index 0416e83..435908a 100644
  G_END_DECLS
  
 diff --git a/src/nautilus-shell-search-provider.c b/src/nautilus-shell-search-provider.c
-index cdadc08..b95babf 100644
+index cdadc08..ffc2b7f 100644
 --- a/src/nautilus-shell-search-provider.c
 +++ b/src/nautilus-shell-search-provider.c
-@@ -426,15 +426,32 @@ search_add_volumes_and_bookmarks (PendingSearch *search)
+@@ -426,15 +426,30 @@ search_add_volumes_and_bookmarks (PendingSearch *search)
      g_object_unref (volume_monitor);
  }
  
@@ -793,8 +826,6 @@ index cdadc08..b95babf 100644
 +    home = g_file_new_for_path (g_get_home_dir ());
 +
 +    query = nautilus_query_new ();
-+    nautilus_query_set_show_hidden_files (query, FALSE);
-+    nautilus_query_set_recursive (query, NAUTILUS_QUERY_RECURSIVE_INDEXED_ONLY);
 +    nautilus_query_set_text (query, terms_joined);
 +    nautilus_query_set_location (query, home);
 +
@@ -813,7 +844,7 @@ index cdadc08..b95babf 100644
  
      cancel_current_search (self);
  
-@@ -446,13 +463,7 @@ execute_search (NautilusShellSearchProvider  *self,
+@@ -446,13 +461,9 @@ execute_search (NautilusShellSearchProvider  *self,
          return;
      }
  
@@ -821,10 +852,11 @@ index cdadc08..b95babf 100644
 -    home = g_file_new_for_path (g_get_home_dir ());
 -
 -    query = nautilus_query_new ();
--    nautilus_query_set_show_hidden_files (query, FALSE);
++    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);
-+    query = shell_query_new (terms);
  
      pending_search = g_slice_new0 (PendingSearch);
      pending_search->invocation = g_object_ref (invocation);
@@ -838,7 +870,7 @@ index cdadc08..b95babf 100644
  }
  
  static gboolean
-@@ -713,13 +721,9 @@ handle_launch_search (NautilusShellSearchProvider2  *skeleton,
+@@ -713,13 +721,23 @@ handle_launch_search (NautilusShellSearchProvider2  *skeleton,
                        gpointer                       user_data)
  {
      GApplication *app = g_application_get_default ();
@@ -847,7 +879,20 @@ index cdadc08..b95babf 100644
 +    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);
diff --git a/debian/patches/series b/debian/patches/series
index 09e8099..41a35d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,9 +16,11 @@ ubuntu_backspace_behaviour.patch
 0001-Respect-gtk-dialogs-use-header-for-all-dialogs.patch
 #Needs updating
 #16_unity_new_documents.patch
-0015-tracker-search-engine-don-t-start-it-if-not-availabl.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
+nautilusgtkplacesview-show-error-if-volume-is-not-mo.patch
+file-view-Always-unset-pending_selection-after-freeing-it.patch