Re: [Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
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/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master. Requested reviews: Sebastien Bacher (seb128) 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/356725 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master. diff --git a/debian/changelog b/debian/changelog index 4238695..14a1f2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nautilus (1:3.26.4-0ubuntu7) 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 13:57:46 +0200 + nautilus (1:3.26.4-0ubuntu6) cosmic; 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/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 d0bf55c..5b5e74c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,12 +14,10 @@ zg_activity_logging.patch ubuntu_infobars_color.patch ubuntu_backspace_behaviour.patch 0001-Respect-gtk-dialogs-use-header-for-all-dialogs.patch -#Needs updating -#16_unity_new_documents.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
[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
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
Re: [Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
Review: Approve thanks -- https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/356725 Your team Ubuntu Desktop is subscribed to branch ~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] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
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
[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/356725 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
