Merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic

[Marco Trevisan (Treviño)]

2900d50... by Sebastien Bacher on 2019-03-06

Import Debian changes 1:3.26.4-0~ubuntu18.04.4

nautilus (1:3.26.4-0~ubuntu18.04.4) bionic; urgency=medium

  * d/p/0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch:
    - update the patch to fix a logic error in the code which made tracker
      never being used even if it's installed (lp: #1767817)

fe34d5e... by Marco Trevisan (Treviño) on 2019-10-25

Update changelog

b56b8e9... by Marco Trevisan (Treviño) on 2019-10-25

Finalise changelog

Unmerged commits

b56b8e9... by Marco Trevisan (Treviño) on 2019-10-25

Finalise changelog

fe34d5e... by Marco Trevisan (Treviño) on 2019-10-25

Update changelog

c529d31... by Marco Trevisan (Treviño) on 2018-08-28

d/p/ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch

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.

Fixes LP: #1756826

2900d50... by Sebastien Bacher on 2019-03-06

Import Debian changes 1:3.26.4-0~ubuntu18.04.4

nautilus (1:3.26.4-0~ubuntu18.04.4) bionic; urgency=medium

  * d/p/0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch:
    - update the patch to fix a logic error in the code which made tracker
      never being used even if it's installed (lp: #1767817)

diff --git a/debian/changelog b/debian/changelog
index 17553e8..abea57d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+nautilus (1:3.26.4-0~ubuntu18.04.5) 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)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Fri, 25 Oct 2019 05:38:04 +0200
+
+nautilus (1:3.26.4-0~ubuntu18.04.4) bionic; urgency=medium
+
+  * d/p/0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch:
+    - update the patch to fix a logic error in the code which made tracker
+      never being used even if it's installed (lp: #1767817)
+
+ -- Sebastien Bacher <[e-mail]>  Wed, 06 Mar 2019 17:31:08 +0100
+
 nautilus (1:3.26.4-0~ubuntu18.04.3) bionic; urgency=medium
 
   * debian/patches/git_captions_order.patch
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 4cc55ed..d24e83c 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
@@ -6,10 +6,10 @@ Subject: tracker-search-engine: don't start it if not available on system
  src/nautilus-search-engine-tracker.c | 24 ++++++++++++++++++++----
  1 file changed, 20 insertions(+), 4 deletions(-)
 
-diff --git a/src/nautilus-search-engine-tracker.c b/src/nautilus-search-engine-tracker.c
-index 8885ca4..050716d 100644
---- a/src/nautilus-search-engine-tracker.c
-+++ b/src/nautilus-search-engine-tracker.c
+Index: nautilus-3.26.4/src/nautilus-search-engine-tracker.c
+===================================================================
+--- nautilus-3.26.4.orig/src/nautilus-search-engine-tracker.c
++++ nautilus-3.26.4/src/nautilus-search-engine-tracker.c
 @@ -42,6 +42,7 @@ struct _NautilusSearchEngineTracker
      gboolean query_pending;
      GQueue *hits_pending;
@@ -18,7 +18,7 @@ index 8885ca4..050716d 100644
      gboolean recursive;
      gboolean fts_enabled;
  
-@@ -304,8 +305,15 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider)
+@@ -304,8 +305,15 @@ nautilus_search_engine_tracker_start (Na
          return;
      }
  
@@ -35,7 +35,7 @@ index 8885ca4..050716d 100644
      tracker->query_pending = TRUE;
  
      g_object_notify (G_OBJECT (provider), "running");
-@@ -471,6 +479,9 @@ nautilus_search_engine_tracker_set_query (NautilusSearchProvider *provider,
+@@ -471,6 +479,9 @@ nautilus_search_engine_tracker_set_query
  
      g_clear_object (&tracker->query);
  
@@ -45,7 +45,7 @@ index 8885ca4..050716d 100644
      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
+@@ -539,16 +550,23 @@ static void
  nautilus_search_engine_tracker_init (NautilusSearchEngineTracker *engine)
  {
      GError *error = NULL;
@@ -54,8 +54,10 @@ index 8885ca4..050716d 100644
 -    engine->hits_pending = g_queue_new ();
 -
 -    engine->connection = tracker_sparql_connection_get (NULL, &error);
-+    if (!tracker_available)
++    if (tracker_available)
 +        engine->connection = tracker_sparql_connection_get (NULL, &error);
++    else
++        return;
  
      if (error)
      {
diff --git a/debian/patches/series b/debian/patches/series
index 9417da4..3ec0d73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,3 +26,4 @@ appstream-compulsory.patch
 nautilusgtkplacesview-show-error-if-volume-is-not-mo.patch
 file-view-Always-unset-pending_selection-after-freeing-it.patch
 git_captions_order.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
new file mode 100644
index 0000000..85fa0c2
--- /dev/null
+++ b/debian/patches/ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch
@@ -0,0 +1,213 @@
+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