Merge ~juliank/ubuntu/+source/nautilus/+git/nautilus:fix-double-deref into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master

Proposed by Julian Andres Klode on 2018-11-22
Status: Merged
Approved by: Sebastien Bacher on 2018-11-23
Approved revision: f8c7ddc87105450df8264485faba2dcbbbac692c
Merged at revision: f8c7ddc87105450df8264485faba2dcbbbac692c
Proposed branch: ~juliank/ubuntu/+source/nautilus/+git/nautilus:fix-double-deref
Merge into: ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
Diff against target: 53 lines (+11/-5)
2 files modified
debian/changelog (+7/-0)
debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch (+4/-5)
Reviewer Review Type Date Requested Status
Sebastien Bacher 2018-11-22 Approve on 2018-11-23
Marco Trevisan (Treviño) (community) 2018-11-22 Approve on 2018-11-22
Review via email: mp+359188@code.launchpad.net

Commit message

Fix for bug 1804260

To post a comment you must log in.
Marco Trevisan (Treviño) (3v1n0) wrote :

Right, thanks... Since we use the autoptr here, while in the upstream change we removed it.

If you'd like, would be also possible to sync with what proposed here https://gitlab.gnome.org/GNOME/nautilus/merge_requests/323/ (and about to merge).

review: Approve
Sebastien Bacher (seb128) wrote :

Thanks Julian, do you want to merge/upload the fix or would you prefer for someone from desktop to do it?

review: Approve
Julian Andres Klode (juliank) wrote :

I can upload it, no problem.

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 a5d6c88..8120926 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+nautilus (1:3.26.4-0ubuntu9) UNRELEASED; urgency=medium
7+
8+ * d/p/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch:
9+ - Fix double deref introduced in the previous upload (LP: #1804260)
10+
11+ -- Julian Andres Klode <juliank@ubuntu.com> Thu, 22 Nov 2018 12:33:53 +0100
12+
13 nautilus (1:3.26.4-0ubuntu8) disco; 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 c4be530..03ad9c3 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@@ -17,10 +17,10 @@ Applied-Upstream: 3.30.0, https://gitlab.gnome.org/GNOME/nautilus/commit/6968637
21 Forwarded: yes, https://gitlab.gnome.org/GNOME/nautilus/merge_requests/335
22 ---
23 src/meson.build | 2 +
24- src/nautilus-search-engine-recent.c | 433 ++++++++++++++++++++++++++++++++++++
25+ src/nautilus-search-engine-recent.c | 432 ++++++++++++++++++++++++++++++++++++
26 src/nautilus-search-engine-recent.h | 36 +++
27 src/nautilus-search-engine.c | 11 +
28- 4 files changed, 482 insertions(+)
29+ 4 files changed, 481 insertions(+)
30 create mode 100644 src/nautilus-search-engine-recent.c
31 create mode 100644 src/nautilus-search-engine-recent.h
32
33@@ -39,10 +39,10 @@ index 73aafe9..213b35f 100644
34 'nautilus-search-hit.c',
35 diff --git a/src/nautilus-search-engine-recent.c b/src/nautilus-search-engine-recent.c
36 new file mode 100644
37-index 0000000..95d8c21
38+index 0000000..36c7247
39 --- /dev/null
40 +++ b/src/nautilus-search-engine-recent.c
41-@@ -0,0 +1,433 @@
42+@@ -0,0 +1,432 @@
43 +/*
44 + * Copyright (C) 2018 Canonical Ltd
45 + *
46@@ -366,7 +366,6 @@ index 0000000..95d8c21
47 +
48 + g_list_free_full (recent_items, (GDestroyNotify) gtk_recent_info_unref);
49 + g_list_free_full (mime_types, g_free);
50-+ g_object_unref (self);
51 +
52 + return NULL;
53 +}

Subscribers

People subscribed via source and target branches