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

Proposed by Marco Trevisan (Treviño) on 2018-10-15
Status: Merged
Merged at revision: 639799e35b4114002ed8e09c31caf3fc95ce18e2
Proposed branch: ~3v1n0/ubuntu/+source/nautilus:ubuntu/master
Merge into: ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
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 2018-10-15 Approve on 2018-10-15
Review via email: mp+356725@code.launchpad.net
To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 4238695..d79bfd8 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+nautilus (1:3.26.4-0ubuntu7) UNRELEASED; urgency=medium
7+
8+ * d/p/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch:
9+ - Fix unpaired unref on search engine (LP: #1797851)
10+
11+ -- Marco Trevisan (Treviño) <marco@ubuntu.com> Mon, 15 Oct 2018 13:57:46 +0200
12+
13 nautilus (1:3.26.4-0ubuntu6) cosmic; urgency=medium
14
15 * d/p/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch:
16diff --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
17index d2c1db5..56ab309 100644
18--- a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch
19+++ b/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch
20@@ -14,7 +14,7 @@ just a waste.
21
22 Origin: upstream
23 Applied-Upstream: 3.30.0, https://gitlab.gnome.org/GNOME/nautilus/commit/69686372fd6e6
24-Forwarded: yes, https://gitlab.gnome.org/GNOME/nautilus/merge_requests/323
25+Forwarded: yes, https://gitlab.gnome.org/GNOME/nautilus/merge_requests/335
26 ---
27 src/meson.build | 2 +
28 src/nautilus-search-engine-recent.c | 440 ++++++++++++++++++++++++++++++++++++
29@@ -39,7 +39,7 @@ index 73aafe9..213b35f 100644
30 'nautilus-search-hit.c',
31 diff --git a/src/nautilus-search-engine-recent.c b/src/nautilus-search-engine-recent.c
32 new file mode 100644
33-index 0000000..bdd130d
34+index 0000000..40cf7e0
35 --- /dev/null
36 +++ b/src/nautilus-search-engine-recent.c
37 @@ -0,0 +1,440 @@
38@@ -177,7 +177,7 @@ index 0000000..bdd130d
39 + }
40 +
41 + search_hits = g_new0 (SearchHitsData, 1);
42-+ search_hits->recent = self;
43++ search_hits->recent = g_object_ref (self);
44 + search_hits->hits = hits;
45 +
46 + self->add_hits_idle_id = g_idle_add (search_thread_add_hits_idle, search_hits);
47@@ -234,7 +234,6 @@ index 0000000..bdd130d
48 + NautilusSearchEngineRecent *self = NAUTILUS_SEARCH_ENGINE_RECENT (user_data);
49 + g_autoptr (GPtrArray) date_range = NULL;
50 + g_autoptr (GFile) query_location = NULL;
51-+ SearchHitsData *search_hits;
52 + GList *recent_items;
53 + GList *mime_types;
54 + GList *hits;
55@@ -368,6 +367,7 @@ index 0000000..bdd130d
56 +
57 + g_list_free_full (recent_items, (GDestroyNotify) gtk_recent_info_unref);
58 + g_list_free_full (mime_types, g_free);
59++ g_object_unref (self);
60 +
61 + return NULL;
62 +}

Subscribers

People subscribed via source and target branches