Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic.
Commit message:
Sync VCS with packaging
Requested reviews:
Ubuntu Server Dev import team (usd-import-team)
Related bugs:
Bug #1767817 in nautilus (Ubuntu): "Full text search does not work"
https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1767817
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/374710
--
Your team Ubuntu Desktop is subscribed to branch
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 17553e8..ad6d1f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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 <seb...@ubuntu.com> 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)
{
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
