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

2018-11-23 Thread TreviƱo
Review: Approve

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).
-- 
https://code.launchpad.net/~juliank/ubuntu/+source/nautilus/+git/nautilus/+merge/359188
Your team Ubuntu Desktop is requested to review the proposed merge of 
~juliank/ubuntu/+source/nautilus/+git/nautilus:fix-double-deref into 
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master.

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


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

2018-11-23 Thread Julian Andres Klode
Julian Andres Klode has proposed merging 
~juliank/ubuntu/+source/nautilus/+git/nautilus:fix-double-deref into 
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master.

Commit message:
Fix for bug 1804260

Requested reviews:
  Ubuntu Desktop (ubuntu-desktop)
Related bugs:
  Bug #1804260 in nautilus (Ubuntu): 
"/usr/bin/nautilus:11:g_type_check_instance_is_fundamentally_a:g_object_unref:nautilus_search_engine_finalize:g_object_unref:g_closure_invoke"
  https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1804260

For more details, see:
https://code.launchpad.net/~juliank/ubuntu/+source/nautilus/+git/nautilus/+merge/359188
-- 
Your team Ubuntu Desktop is requested to review the proposed merge of 
~juliank/ubuntu/+source/nautilus/+git/nautilus:fix-double-deref into 
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index a5d6c88..8120926 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nautilus (1:3.26.4-0ubuntu9) UNRELEASED; urgency=medium
+
+  * d/p/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch:
+- Fix double deref introduced in the previous upload (LP: #1804260)
+
+ -- Julian Andres Klode   Thu, 22 Nov 2018 12:33:53 +0100
+
 nautilus (1:3.26.4-0ubuntu8) disco; urgency=medium
 
   * d/p/0016-search-engine-add-a-recent-search-engine-listing-Gtk.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 c4be530..03ad9c3 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
@@ -17,10 +17,10 @@ Applied-Upstream: 3.30.0, https://gitlab.gnome.org/GNOME/nautilus/commit/6968637
 Forwarded: yes, https://gitlab.gnome.org/GNOME/nautilus/merge_requests/335
 ---
  src/meson.build |   2 +
- src/nautilus-search-engine-recent.c | 433 
+ src/nautilus-search-engine-recent.c | 432 
  src/nautilus-search-engine-recent.h |  36 +++
  src/nautilus-search-engine.c|  11 +
- 4 files changed, 482 insertions(+)
+ 4 files changed, 481 insertions(+)
  create mode 100644 src/nautilus-search-engine-recent.c
  create mode 100644 src/nautilus-search-engine-recent.h
 
@@ -39,10 +39,10 @@ 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..95d8c21
+index 000..36c7247
 --- /dev/null
 +++ b/src/nautilus-search-engine-recent.c
-@@ -0,0 +1,433 @@
+@@ -0,0 +1,432 @@
 +/*
 + * Copyright (C) 2018 Canonical Ltd
 + *
@@ -366,7 +366,6 @@ index 000..95d8c21
 +
 +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;
 +}
-- 
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop