[epiphany/mcatanzaro/#1102: 2/2] bookmarks-popover: fix several leaks

[Jan-Michael Brummer <jbrummer src gnome org>]

commit b1882607afb091b3e84932d54cc4a4eebbc9fc95
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Feb 17 13:41:07 2020 -0600

    bookmarks-popover: fix several leaks
    
    The result of ephy_bookmarks_manager_get_bookmarks_with_tag() must be
    freed.
    
    Fixes #1102

 src/bookmarks/ephy-bookmarks-manager.c |  9 +++++++++
 src/bookmarks/ephy-bookmarks-manager.h |  2 ++
 src/bookmarks/ephy-bookmarks-popover.c | 13 ++++++-------
 3 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/src/bookmarks/ephy-bookmarks-manager.c b/src/bookmarks/ephy-bookmarks-manager.c
index 094d42439..95d631804 100644
--- a/src/bookmarks/ephy-bookmarks-manager.c
+++ b/src/bookmarks/ephy-bookmarks-manager.c
@@ -587,6 +587,15 @@ ephy_bookmarks_manager_get_bookmarks_with_tag (EphyBookmarksManager *self,
   return bookmarks;
 }
 
+gboolean
+ephy_bookmarks_manager_has_bookmarks_with_tag (EphyBookmarksManager *self,
+                                               const char           *tag)
+{
+  g_autoptr (GSequence) bookmarks = ephy_bookmarks_manager_get_bookmarks_with_tag (self, tag);
+
+  return g_sequence_is_empty (bookmarks);
+}
+
 GSequence *
 ephy_bookmarks_manager_get_tags (EphyBookmarksManager *self)
 {
diff --git a/src/bookmarks/ephy-bookmarks-manager.h b/src/bookmarks/ephy-bookmarks-manager.h
index f465c76ee..198fe085e 100644
--- a/src/bookmarks/ephy-bookmarks-manager.h
+++ b/src/bookmarks/ephy-bookmarks-manager.h
@@ -58,6 +58,8 @@ gboolean     ephy_bookmarks_manager_tag_exists                      (EphyBookmar
 GSequence   *ephy_bookmarks_manager_get_bookmarks                   (EphyBookmarksManager *self);
 GSequence   *ephy_bookmarks_manager_get_bookmarks_with_tag          (EphyBookmarksManager *self,
                                                                      const char           *tag);
+gboolean     ephy_bookmarks_manager_has_bookmarks_with_tag          (EphyBookmarksManager *self,
+                                                                     const char           *tag);
 GSequence   *ephy_bookmarks_manager_get_tags                        (EphyBookmarksManager *self);
 
 gboolean     ephy_bookmarks_manager_save_sync                       (EphyBookmarksManager  *self,
diff --git a/src/bookmarks/ephy-bookmarks-popover.c b/src/bookmarks/ephy-bookmarks-popover.c
index 8801afe38..4fc24f293 100644
--- a/src/bookmarks/ephy-bookmarks-popover.c
+++ b/src/bookmarks/ephy-bookmarks-popover.c
@@ -177,7 +177,7 @@ ephy_bookmarks_popover_bookmark_tag_removed_cb (EphyBookmarksPopover *self,
                                         ephy_bookmark_get_url (bookmark));
 
     /* If we removed the tag's last bookmark, switch back to the tags list. */
-    if (g_sequence_is_empty (ephy_bookmarks_manager_get_bookmarks_with_tag (self->manager, tag))) {
+    if (ephy_bookmarks_manager_has_bookmarks_with_tag (self->manager, tag)) {
       GActionGroup *group;
       GAction *action;
 
@@ -188,7 +188,7 @@ ephy_bookmarks_popover_bookmark_tag_removed_cb (EphyBookmarksPopover *self,
   }
 
   /* If the tag no longer contains bookmarks, remove it from the tags list */
-  if (g_sequence_is_empty (ephy_bookmarks_manager_get_bookmarks_with_tag (self->manager, tag))) {
+  if (ephy_bookmarks_manager_has_bookmarks_with_tag (self->manager, tag)) {
     children = gtk_container_get_children (GTK_CONTAINER (self->tags_list_box));
     for (l = children; l != NULL; l = l->next) {
       title = g_object_get_data (G_OBJECT (l->data), "title");
@@ -290,7 +290,7 @@ ephy_bookmarks_popover_bookmark_removed_cb (EphyBookmarksPopover *self,
   if (g_list_model_get_n_items (G_LIST_MODEL (self->manager)) == 0) {
     gtk_stack_set_visible_child_name (GTK_STACK (self->toplevel_stack), "empty-state");
   } else if (g_strcmp0 (gtk_stack_get_visible_child_name (GTK_STACK (self->toplevel_stack)), "tag_detail") 
== 0 &&
-             g_sequence_is_empty (ephy_bookmarks_manager_get_bookmarks_with_tag (self->manager, 
self->tag_detail_tag))) {
+             ephy_bookmarks_manager_has_bookmarks_with_tag (self->manager, self->tag_detail_tag)) {
     /* If we removed the tag's last bookmark, switch back to the tags list. */
     GActionGroup *group;
     GAction *action;
@@ -511,9 +511,9 @@ static void
 ephy_bookmarks_popover_init (EphyBookmarksPopover *self)
 {
   GSequence *tags;
-  GSequence *bookmarks;
   GSequenceIter *iter;
-  GSimpleActionGroup *group;
+  g_autoptr (GSequence) bookmarks = NULL;
+  g_autoptr (GSimpleActionGroup) group = NULL;
 
   gtk_widget_init_template (GTK_WIDGET (self));
 
@@ -524,7 +524,6 @@ ephy_bookmarks_popover_init (EphyBookmarksPopover *self)
                                    G_N_ELEMENTS (entries), self);
   gtk_widget_insert_action_group (GTK_WIDGET (self), "popover",
                                   G_ACTION_GROUP (group));
-  g_object_unref (group);
 
   gtk_list_box_bind_model (GTK_LIST_BOX (self->bookmarks_list_box),
                            G_LIST_MODEL (self->manager),
@@ -548,7 +547,7 @@ ephy_bookmarks_popover_init (EphyBookmarksPopover *self)
     const char *tag = g_sequence_get (iter);
     GtkWidget *tag_row;
 
-    if (!g_sequence_is_empty (ephy_bookmarks_manager_get_bookmarks_with_tag (self->manager, tag))) {
+    if (!ephy_bookmarks_manager_has_bookmarks_with_tag (self->manager, tag)) {
       tag_row = create_tag_row (tag);
       gtk_container_add (GTK_CONTAINER (self->tags_list_box), tag_row);
     }