[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic

2019-10-25 Thread Treviño 
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   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 (>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, );
-+if (!tracker_available)
++if (tracker_available)
 +engine->connection = tracker_sparql_connection_get (NULL, );
++else
++return;
  
  if (error)
  {
-- 
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop

Re: [Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic

2018-10-18 Thread Sebastien Bacher 
Review: Approve

Thanks
-- 
https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/356988
Your team Ubuntu Desktop is subscribed to branch 
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic.

-- 
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop

[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic

2018-10-18 Thread Treviño 
Marco Trevisan (Treviño) has proposed merging 
~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into 
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic.

Requested reviews:
  Ubuntu Desktop (ubuntu-desktop)

For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/356988
-- 
Your team Ubuntu Desktop is requested to review the proposed merge of 
~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into 
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 1ae1d9a..4b9813a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,9 @@
-nautilus (1:3.26.4-0~ubuntu18.04.3) bionic; urgency=medium
-
-  * d/p/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch:
-- Fix unpaired unref on search engine (LP: #1795028)
-
- -- Marco Trevisan (Treviño)   Mon, 15 Oct 2018 15:23:29 +0200
-
-nautilus (1:3.26.4-0~ubuntu18.04.2) bionic; urgency=medium
+nautilus (1:3.26.4-0~ubuntu18.04.2) UNRELEASED; urgency=medium
 
   * d/p/search-engine-Query-file-system-to-determine-remoteness.patch:
 - Fix remote filesystem check on file during search (LP: #1795028)
   * d/p/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch:
-- Refreshed to add memory leak and potential crash fixes
+- Refreshed to add memory leak and potential crash fixes (LP: #1798426)
 
  -- Marco Trevisan (Treviño)   Mon, 08 Oct 2018 18:30:01 +0200
 
-- 
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop

[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic

2018-10-18 Thread noreply 
The proposal to merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into 
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/356988
-- 
Your team Ubuntu Desktop is subscribed to branch 
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic.

-- 
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop

Re: [Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic

2018-10-16 Thread Sebastien Bacher 
Review: Approve

thanks
-- 
https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/356726
Your team Ubuntu Desktop is subscribed to branch 
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic.

-- 
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop

[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic

2018-10-16 Thread noreply 
The proposal to merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into 
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/356726
-- 
Your team Ubuntu Desktop is subscribed to branch 
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic.

-- 
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop

[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic

2018-10-16 Thread Treviño 
Marco Trevisan (Treviño) has proposed merging 
~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into 
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic.

Requested reviews:
  Ubuntu Desktop (ubuntu-desktop)
Related bugs:
  Bug #1797851 in nautilus (Ubuntu): 
"/usr/bin/nautilus:11:g_type_check_instance_cast:NAUTILUS_SEARCH_PROVIDER:nautilus_search_engine_stop:stop_search:disconnect_model_handlers"
  https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1797851

For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/356726
-- 
Your team Ubuntu Desktop is requested to review the proposed merge of 
~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into 
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index b5e373c..3f70525 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nautilus (1:3.26.4-0~ubuntu18.04.3) UNRELEASED; urgency=medium
+
+  * search-engine-add-a-recent-search-engine-listing-GtkRecen.patch:
+- Fix unpaired unref on search engine (LP: #1797851)
+
+ -- Marco Trevisan (Treviño)   Mon, 15 Oct 2018 14:05:37 +0200
+
 nautilus (1:3.26.4-0~ubuntu18.04.2) bionic; urgency=medium
 
   * d/p/search-engine-Query-file-system-to-determine-remoteness.patch:
diff --git a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch b/debian/patches/search-engine-add-a-recent-search-engine-listing-GtkRecen.patch
index d2c1db5..56ab309 100644
--- a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch
+++ b/debian/patches/search-engine-add-a-recent-search-engine-listing-GtkRecen.patch
@@ -14,7 +14,7 @@ just a waste.
 
 Origin: upstream
 Applied-Upstream: 3.30.0, https://gitlab.gnome.org/GNOME/nautilus/commit/69686372fd6e6
-Forwarded: yes, https://gitlab.gnome.org/GNOME/nautilus/merge_requests/323
+Forwarded: yes, https://gitlab.gnome.org/GNOME/nautilus/merge_requests/335
 ---
  src/meson.build |   2 +
  src/nautilus-search-engine-recent.c | 440 
@@ -39,7 +39,7 @@ index 73aafe9..213b35f 100644
  'nautilus-search-hit.c',
 diff --git a/src/nautilus-search-engine-recent.c b/src/nautilus-search-engine-recent.c
 new file mode 100644
-index 000..bdd130d
+index 000..40cf7e0
 --- /dev/null
 +++ b/src/nautilus-search-engine-recent.c
 @@ -0,0 +1,440 @@
@@ -177,7 +177,7 @@ index 000..bdd130d
 +}
 +
 +search_hits = g_new0 (SearchHitsData, 1);
-+search_hits->recent = self;
++search_hits->recent = g_object_ref (self);
 +search_hits->hits = hits;
 +
 +self->add_hits_idle_id = g_idle_add (search_thread_add_hits_idle, search_hits);
@@ -234,7 +234,6 @@ index 000..bdd130d
 +NautilusSearchEngineRecent *self = NAUTILUS_SEARCH_ENGINE_RECENT (user_data);
 +g_autoptr (GPtrArray) date_range = NULL;
 +g_autoptr (GFile) query_location = NULL;
-+SearchHitsData *search_hits;
 +GList *recent_items;
 +GList *mime_types;
 +GList *hits;
@@ -368,6 +367,7 @@ index 000..bdd130d
 +
 +g_list_free_full (recent_items, (GDestroyNotify) gtk_recent_info_unref);
 +g_list_free_full (mime_types, g_free);
++g_object_unref (self);
 +
 +return NULL;
 +}
diff --git a/debian/patches/series b/debian/patches/series
index 2942ff8..c7781c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,7 +19,7 @@ ubuntu_backspace_behaviour.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
+search-engine-add-a-recent-search-engine-listing-GtkRecen.patch
 0017-recent-add-function-to-update-manager-on-file-rename.patch
 0018-search-engine-add-locate-based-search-engine.patch
 appstream-compulsory.patch
-- 
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop