Ubuntu
nautilus package

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

  1. Git
  2. lp:~3v1n0/ubuntu/+source/nautilus
  3. ubuntu/bionic
  4. Merge into ubuntu/bionic
Proposed by Marco Trevisan (Treviño)
Status: Merged
Merged at revision: a107f5328bbb8d831c63ea1c81391374c00b0dd9
Proposed branch: ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic
Merge into: ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
Diff against target: 62 lines (+11/-4)
2 files modified
debian/changelog (+7/-0)
debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch (+4/-4)
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+356726@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index b5e373c..b0143c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1nautilus (1:3.26.4-0~ubuntu18.04.3) UNRELEASED; urgency=medium
2
3 * d/p/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch:
4 - Fix unpaired unref on search engine (LP: #1797851)
5
6 -- Marco Trevisan (Treviño) <marco@ubuntu.com> Mon, 15 Oct 2018 14:05:37 +0200
7
1nautilus (1:3.26.4-0~ubuntu18.04.2) bionic; urgency=medium8nautilus (1:3.26.4-0~ubuntu18.04.2) bionic; urgency=medium
29
3 * d/p/search-engine-Query-file-system-to-determine-remoteness.patch:10 * 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/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch
index d2c1db5..56ab309 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
@@ -14,7 +14,7 @@ just a waste.
1414
15Origin: upstream15Origin: upstream
16Applied-Upstream: 3.30.0, https://gitlab.gnome.org/GNOME/nautilus/commit/69686372fd6e616Applied-Upstream: 3.30.0, https://gitlab.gnome.org/GNOME/nautilus/commit/69686372fd6e6
17Forwarded: yes, https://gitlab.gnome.org/GNOME/nautilus/merge_requests/32317Forwarded: yes, https://gitlab.gnome.org/GNOME/nautilus/merge_requests/335
18---18---
19 src/meson.build | 2 +19 src/meson.build | 2 +
20 src/nautilus-search-engine-recent.c | 440 ++++++++++++++++++++++++++++++++++++20 src/nautilus-search-engine-recent.c | 440 ++++++++++++++++++++++++++++++++++++
@@ -39,7 +39,7 @@ index 73aafe9..213b35f 100644
39 'nautilus-search-hit.c',39 'nautilus-search-hit.c',
40diff --git a/src/nautilus-search-engine-recent.c b/src/nautilus-search-engine-recent.c40diff --git a/src/nautilus-search-engine-recent.c b/src/nautilus-search-engine-recent.c
41new file mode 10064441new file mode 100644
42index 0000000..bdd130d42index 0000000..40cf7e0
43--- /dev/null43--- /dev/null
44+++ b/src/nautilus-search-engine-recent.c44+++ b/src/nautilus-search-engine-recent.c
45@@ -0,0 +1,440 @@45@@ -0,0 +1,440 @@
@@ -177,7 +177,7 @@ index 0000000..bdd130d
177+ }177+ }
178+178+
179+ search_hits = g_new0 (SearchHitsData, 1);179+ search_hits = g_new0 (SearchHitsData, 1);
180+ search_hits->recent = self;180+ search_hits->recent = g_object_ref (self);
181+ search_hits->hits = hits;181+ search_hits->hits = hits;
182+182+
183+ self->add_hits_idle_id = g_idle_add (search_thread_add_hits_idle, search_hits);183+ self->add_hits_idle_id = g_idle_add (search_thread_add_hits_idle, search_hits);
@@ -234,7 +234,6 @@ index 0000000..bdd130d
234+ NautilusSearchEngineRecent *self = NAUTILUS_SEARCH_ENGINE_RECENT (user_data);234+ NautilusSearchEngineRecent *self = NAUTILUS_SEARCH_ENGINE_RECENT (user_data);
235+ g_autoptr (GPtrArray) date_range = NULL;235+ g_autoptr (GPtrArray) date_range = NULL;
236+ g_autoptr (GFile) query_location = NULL;236+ g_autoptr (GFile) query_location = NULL;
237+ SearchHitsData *search_hits;
238+ GList *recent_items;237+ GList *recent_items;
239+ GList *mime_types;238+ GList *mime_types;
240+ GList *hits;239+ GList *hits;
@@ -368,6 +367,7 @@ index 0000000..bdd130d
368+367+
369+ g_list_free_full (recent_items, (GDestroyNotify) gtk_recent_info_unref);368+ g_list_free_full (recent_items, (GDestroyNotify) gtk_recent_info_unref);
370+ g_list_free_full (mime_types, g_free);369+ g_list_free_full (mime_types, g_free);
370+ g_object_unref (self);
371+371+
372+ return NULL;372+ return NULL;
373+}373+}

Subscribers

People subscribed via source and target branches