Merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic

[Marco Trevisan (Treviño)]

fde29bc... by Marco Trevisan (Treviño) on 2018-10-04

Finalise changelog

Unmerged commits

fde29bc... by Marco Trevisan (Treviño) on 2018-10-04

Finalise changelog

43a23ec... by Marco Trevisan (Treviño) on 2018-09-28

d/p/search-engine-Query-file-system-to-determine-remoteness.patch

Cherry-pick remote filesystem check on file during search.

Fixes LP: #1795028

diff --git a/debian/changelog b/debian/changelog
index 312bb43..1d1673f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,9 @@
-nautilus (1:3.26.4-0~ubuntu18.04.2) UNRELEASED; urgency=medium
+nautilus (1:3.26.4-0~ubuntu18.04.2) bionic; urgency=medium
 
-  * d/p/ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch:
-    shell-search-provider: implement XUbuntuCancel to request pending
-    search cancellation from gnome-shell (LP: #1756826)
+  * d/p/search-engine-Query-file-system-to-determine-remoteness.patch:
+    - Fix remote filesystem check on file during search (LP: #1795028)
 
- -- Marco Trevisan (Treviño) <[e-mail]>  Wed, 05 Sep 2018 18:03:14 +0200
+ -- Marco Trevisan (Treviño) <[e-mail]>  Thu, 04 Oct 2018 16:15:08 +0200
 
 nautilus (1:3.26.4-0~ubuntu18.04.1) bionic; urgency=medium
 
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 f80997f..20e597c 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
@@ -512,7 +512,7 @@ index 0000000..bcd73b9
 +
 +#endif /* __NAUTILUS_SEARCH_ENGINE_RECENT_H__ */
 diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c
-index 3a0c9d4..793b831 100644
+index 28863f7..a4c6007 100644
 --- a/src/nautilus-search-engine.c
 +++ b/src/nautilus-search-engine.c
 @@ -30,11 +30,13 @@
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 e6185da..ad248da 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
@@ -49,7 +49,7 @@ index 19316e8..9bb5460 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 63413a6..9416214 100644
+index 28b5a13..7886d1f 100644
 --- a/src/nautilus-file.c
 +++ b/src/nautilus-file.c
 @@ -34,6 +34,7 @@
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 91a7ec0..158b448 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,7 +678,7 @@ index 0000000..ac5e3fc
 +
 +#endif /* __NAUTILUS_SEARCH_ENGINE_LOCATE_H__ */
 diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c
-index 793b831..902d483 100644
+index a4c6007..475a432 100644
 --- a/src/nautilus-search-engine.c
 +++ b/src/nautilus-search-engine.c
 @@ -29,6 +29,7 @@
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 fddae3e..3c89693 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
@@ -198,7 +198,7 @@ index b567611..b165d63 100644
 +
  #endif /* NAUTILUS_FILE_UTILITIES_H */
 diff --git a/src/nautilus-file.c b/src/nautilus-file.c
-index 3f6a69f..63413a6 100644
+index 22ea199..e30d791 100644
 --- a/src/nautilus-file.c
 +++ b/src/nautilus-file.c
 @@ -4975,6 +4975,29 @@ nautilus_file_get_filesystem_type (NautilusFile *file)
diff --git a/debian/patches/search-engine-Query-file-system-to-determine-remoteness.patch b/debian/patches/search-engine-Query-file-system-to-determine-remoteness.patch
new file mode 100644
index 0000000..1b7f874
--- /dev/null
+++ b/debian/patches/search-engine-Query-file-system-to-determine-remoteness.patch
@@ -0,0 +1,127 @@
+From: Ernestas Kulik <[e-mail]>
+Date: Fri, 14 Sep 2018 12:52:11 +0200
+Subject: search-engine: Query file system to determine remoteness
+
+Querying the file cache in is_recursive_search() does not guarantee that
+the file system field will be populated with a value, and somehow
+results in data races, in turn resulting in random crashes/file list
+corruption.
+
+Hopefully fixes https://gitlab.gnome.org/GNOME/nautilus/issues/640,
+closes https://gitlab.gnome.org/GNOME/nautilus/issues/632 and resolves
+https://gitlab.gnome.org/GNOME/nautilus/issues/602
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1795028
+Applied-Upstream: yes, 3.30.1, https://gitlab.gnome.org/GNOME/nautilus/commit/62ba6d83d
+---
+ src/nautilus-file-utilities.c | 18 ++++++++++++++++++
+ src/nautilus-file-utilities.h |  2 ++
+ src/nautilus-file.c           | 14 +-------------
+ src/nautilus-search-engine.c  | 18 +++++++++++++++---
+ 4 files changed, 36 insertions(+), 16 deletions(-)
+
+diff --git a/src/nautilus-file-utilities.c b/src/nautilus-file-utilities.c
+index f8d8476..3e363a4 100644
+--- a/src/nautilus-file-utilities.c
++++ b/src/nautilus-file-utilities.c
+@@ -1565,3 +1565,21 @@ location_settings_search_get_recursive_for_location (GFile *location)
+ 
+     return recursive;
+ }
++
++gboolean
++nautilus_file_system_is_remote (const char *file_system)
++{
++    static const gchar * const remote_types[] =
++    {
++        "afp",
++        "google-drive",
++        "sftp",
++        "webdav",
++        "ftp",
++        "nfs",
++        "cifs",
++        NULL
++    };
++
++    return file_system != NULL && g_strv_contains (remote_types, file_system);
++}
+diff --git a/src/nautilus-file-utilities.h b/src/nautilus-file-utilities.h
+index b165d63..37f7f49 100644
+--- a/src/nautilus-file-utilities.h
++++ b/src/nautilus-file-utilities.h
+@@ -133,4 +133,6 @@ 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);
+ 
++gboolean nautilus_file_system_is_remote (const char *file_system);
++
+ #endif /* NAUTILUS_FILE_UTILITIES_H */
+diff --git a/src/nautilus-file.c b/src/nautilus-file.c
+index e30d791..28b5a13 100644
+--- a/src/nautilus-file.c
++++ b/src/nautilus-file.c
+@@ -8371,18 +8371,6 @@ nautilus_file_is_in_recent (NautilusFile *file)
+     return nautilus_directory_is_in_recent (file->details->directory);
+ }
+ 
+-static const gchar * const remote_types[] =
+-{
+-    "afp",
+-    "google-drive",
+-    "sftp",
+-    "webdav",
+-    "ftp",
+-    "nfs",
+-    "cifs",
+-    NULL
+-};
+-
+ /**
+  * nautilus_file_is_remote
+  *
+@@ -8406,7 +8394,7 @@ nautilus_file_is_remote (NautilusFile *file)
+ 
+     filesystem_type = nautilus_file_get_filesystem_type (file);
+ 
+-    return filesystem_type != NULL && g_strv_contains (remote_types, filesystem_type);
++    return nautilus_file_system_is_remote (filesystem_type);
+ }
+ 
+ /**
+diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c
+index 3a0c9d4..28863f7 100644
+--- a/src/nautilus-search-engine.c
++++ b/src/nautilus-search-engine.c
+@@ -23,7 +23,7 @@
+ #include "nautilus-search-engine.h"
+ #include "nautilus-search-engine-private.h"
+ 
+-#include "nautilus-file.h"
++#include "nautilus-file-utilities.h"
+ #include "nautilus-search-engine-model.h"
+ #include "nautilus-search-provider.h"
+ #include <glib/gi18n.h>
+@@ -437,8 +437,20 @@ is_recursive_search (NautilusSearchEngineType  engine_type,
+ 
+         case NAUTILUS_QUERY_RECURSIVE_LOCAL_ONLY:
+         {
+-            g_autoptr (NautilusFile) file = nautilus_file_get (location);
+-            return !nautilus_file_is_remote (file);
++            g_autoptr (GFileInfo) file_system_info = NULL;
++
++            file_system_info = g_file_query_filesystem_info (location,
++                                                             G_FILE_ATTRIBUTE_FILESYSTEM_TYPE,
++                                                             NULL, NULL);
++            if (file_system_info != NULL)
++            {
++                const char *file_system;
++
++                file_system = g_file_info_get_attribute_string (file_system_info,
++                                                                G_FILE_ATTRIBUTE_FILESYSTEM_TYPE);
++
++                return !nautilus_file_system_is_remote (file_system);
++            }
+         }
+     }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 61d3d3a..2942ff8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,6 +17,7 @@ ubuntu_backspace_behaviour.patch
 #Needs updating
 #16_unity_new_documents.patch
 query-add-recursive-flags-and-use-it-in-search-engines.patch
+search-engine-Query-file-system-to-determine-remoteness.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
@@ -24,4 +25,3 @@ query-add-recursive-flags-and-use-it-in-search-engines.patch
 appstream-compulsory.patch
 nautilusgtkplacesview-show-error-if-volume-is-not-mo.patch
 file-view-Always-unset-pending_selection-after-freeing-it.patch
-ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch
diff --git a/debian/patches/ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch b/debian/patches/ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch
deleted file mode 100644
index ca55544..0000000
--- a/debian/patches/ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <[e-mail]>
-Date: Tue, 28 Aug 2018 01:44:49 +0200
-Subject: shell-search-provider: implement XUbuntuCancel to request search cancellation
-
-Stop search and Metadata fetching on XUbuntuCancel dbus method call.
-Only allow this if the caller is the same who triggered the actual event.
-
-Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/183
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/bionic/+source/nautilus/+bug/1756826
-Forwarded: not-needed
----
- data/shell-search-provider-dbus-interfaces.xml |  1 +
- src/nautilus-shell-search-provider.c           | 96 +++++++++++++++++++++++---
- 2 files changed, 88 insertions(+), 9 deletions(-)
-
-diff --git a/data/shell-search-provider-dbus-interfaces.xml b/data/shell-search-provider-dbus-interfaces.xml
-index f6840e2..4529c1e 100644
---- a/data/shell-search-provider-dbus-interfaces.xml
-+++ b/data/shell-search-provider-dbus-interfaces.xml
-@@ -40,5 +40,6 @@
-       <arg type='as' name='Terms' direction='in' />
-       <arg type='u' name='Timestamp' direction='in' />
-     </method>
-+    <method name = 'XUbuntuCancel' />
-   </interface>
- </node>
-diff --git a/src/nautilus-shell-search-provider.c b/src/nautilus-shell-search-provider.c
-index ffc2b7f..58864d6 100644
---- a/src/nautilus-shell-search-provider.c
-+++ b/src/nautilus-shell-search-provider.c
-@@ -60,6 +60,7 @@ struct _NautilusShellSearchProvider
- 
-     PendingSearch *current_search;
- 
-+    GList *metas_requests;
-     GHashTable *metas_cache;
- };
- 
-@@ -143,11 +144,25 @@ pending_search_finish (PendingSearch         *search,
- }
- 
- static void
--cancel_current_search (NautilusShellSearchProvider *self)
-+cancel_current_search (NautilusShellSearchProvider *self,
-+                       gboolean                     ignore_partial_results)
- {
--    if (self->current_search != NULL)
-+    PendingSearch *search = self->current_search;
-+
-+    if (search != NULL)
-     {
--        nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (self->current_search->engine));
-+        g_debug ("*** Cancel current search");
-+
-+        nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (search->engine));
-+
-+        if (ignore_partial_results)
-+        {
-+            g_signal_handlers_disconnect_by_data (G_OBJECT (search->engine),
-+                                                  search);
-+
-+            pending_search_finish (search, search->invocation,
-+                                   g_variant_new ("(as)", NULL));
-+        }
-     }
- }
- 
-@@ -451,7 +466,7 @@ execute_search (NautilusShellSearchProvider  *self,
-     NautilusQuery *query;
-     PendingSearch *pending_search;
- 
--    cancel_current_search (self);
-+    cancel_current_search (self, FALSE);
- 
-     /* don't attempt searches for a single character */
-     if (g_strv_length (terms) == 1 &&
-@@ -524,6 +539,7 @@ typedef struct
-     NautilusShellSearchProvider *self;
- 
-     gint64 start_time;
-+    NautilusFileListHandle *handle;
-     GDBusMethodInvocation *invocation;
- 
-     gchar **uris;
-@@ -532,6 +548,8 @@ typedef struct
- static void
- result_metas_data_free (ResultMetasData *data)
- {
-+    g_clear_pointer (&data->handle, nautilus_file_list_cancel_call_when_ready);
-+
-     g_clear_object (&data->self);
-     g_clear_object (&data->invocation);
-     g_strfreev (data->uris);
-@@ -549,7 +567,7 @@ result_metas_return_from_cache (ResultMetasData *data)
- 
-     g_variant_builder_init (&builder, G_VARIANT_TYPE ("aa{sv}"));
- 
--    for (idx = 0; data->uris[idx] != NULL; idx++)
-+    for (idx = 0; data->uris && data->uris[idx] != NULL; idx++)
-     {
-         meta = g_hash_table_lookup (data->self->metas_cache,
-                                     data->uris[idx]);
-@@ -564,6 +582,37 @@ result_metas_return_from_cache (ResultMetasData *data)
-                                            g_variant_new ("(aa{sv})", &builder));
- }
- 
-+static void
-+cancel_result_meta_requests (NautilusShellSearchProvider *self,
-+                             GDBusMethodInvocation       *invocation)
-+{
-+    GList *l;
-+    GList *to_remove = NULL;
-+
-+    g_debug ("*** Cancel Results Meta requests");
-+
-+    for (l = self->metas_requests; l; l = l->next)
-+    {
-+        ResultMetasData *data = l->data;
-+
-+        if (invocation == NULL ||
-+            g_strcmp0 (g_dbus_method_invocation_get_sender (data->invocation),
-+                       g_dbus_method_invocation_get_sender (invocation)) == 0)
-+        {
-+            g_clear_pointer (&data->uris, g_strfreev);
-+            result_metas_return_from_cache (data);
-+            to_remove = g_list_prepend (to_remove, data);
-+        }
-+    }
-+
-+    for (l = to_remove; l; l = l->next)
-+    {
-+        self->metas_requests = g_list_remove (self->metas_requests, l->data);
-+    }
-+
-+    g_list_free (to_remove);
-+}
-+
- static void
- result_list_attributes_ready_cb (GList    *file_list,
-                                  gpointer  user_data)
-@@ -639,6 +688,9 @@ result_list_attributes_ready_cb (GList    *file_list,
-         g_free (uri);
-     }
- 
-+    data->handle = NULL;
-+    data->self->metas_requests = g_list_remove (data->self->metas_requests, data);
-+
-     result_metas_return_from_cache (data);
-     result_metas_data_free (data);
- }
-@@ -682,9 +734,10 @@ handle_get_result_metas (NautilusShellSearchProvider2  *skeleton,
- 
-     nautilus_file_list_call_when_ready (missing_files,
-                                         NAUTILUS_FILE_ATTRIBUTES_FOR_ICON,
--                                        NULL,
-+                                        &data->handle,
-                                         result_list_attributes_ready_cb,
-                                         data);
-+    self->metas_requests = g_list_prepend (self->metas_requests, data);
-     nautilus_file_list_free (missing_files);
-     return TRUE;
- }
-@@ -743,14 +796,37 @@ handle_launch_search (NautilusShellSearchProvider2  *skeleton,
-     return TRUE;
- }
- 
--static void
--search_provider_dispose (GObject *obj)
-+static gboolean
-+handle_xubuntu_cancel (NautilusShellSearchProvider2 *skeleton,
-+                       GDBusMethodInvocation        *invocation,
-+                       gpointer                      user_data)
- {
-+    NautilusShellSearchProvider *self = user_data;
-+    PendingSearch *search = self->current_search;
-+
-+    g_debug ("*** XUbuntuCancel called");
-+
-+    if (search != NULL &&
-+        g_strcmp0 (g_dbus_method_invocation_get_sender (search->invocation),
-+                   g_dbus_method_invocation_get_sender (invocation)) == 0)
-+    {
-+        cancel_current_search (self, TRUE);
-+    }
-+
-+    cancel_result_meta_requests (self, invocation);
-+
-+    nautilus_shell_search_provider2_complete_xubuntu_cancel (skeleton, invocation);
-+
-+    return TRUE;
-+}
-+
-+  static void search_provider_dispose(GObject * obj) {
-     NautilusShellSearchProvider *self = NAUTILUS_SHELL_SEARCH_PROVIDER (obj);
- 
-     g_clear_object (&self->skeleton);
-     g_hash_table_destroy (self->metas_cache);
--    cancel_current_search (self);
-+    cancel_current_search (self, TRUE);
-+    cancel_result_meta_requests (self, NULL);
- 
-     G_OBJECT_CLASS (nautilus_shell_search_provider_parent_class)->dispose (obj);
- }
-@@ -773,6 +849,8 @@ nautilus_shell_search_provider_init (NautilusShellSearchProvider *self)
-                       G_CALLBACK (handle_activate_result), self);
-     g_signal_connect (self->skeleton, "handle-launch-search",
-                       G_CALLBACK (handle_launch_search), self);
-+    g_signal_connect (self->skeleton, "handle-xubuntu-cancel",
-+                      G_CALLBACK (handle_xubuntu_cancel), self);
- }
- 
- static void