aboutsummaryrefslogtreecommitdiffstats
path: root/src/bookmarks
diff options
context:
space:
mode:
Diffstat (limited to 'src/bookmarks')
-rw-r--r--src/bookmarks/ephy-bookmarks.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index 2432846e3..a4f5412a4 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -174,6 +174,7 @@ ephy_bookmarks_clean_empty_keywords (EphyBookmarks *eb)
{
GPtrArray *children;
int i;
+ GList *l = NULL, *tmp;
children = ephy_node_get_children (eb->priv->keywords);
ephy_node_thaw (eb->priv->keywords);
@@ -185,13 +186,21 @@ ephy_bookmarks_clean_empty_keywords (EphyBookmarks *eb)
if (ephy_node_get_n_children (kid) == 0)
{
- DEBUG_MSG (("Remove empty keyword: %s\n",
- ephy_node_get_property_string (kid,
- EPHY_NODE_KEYWORD_PROP_NAME)));
- ephy_node_unref (kid);
+ l = g_list_append (l, kid);
}
}
+ if (l == NULL) return FALSE;
+
+ for (tmp = l; tmp != NULL; tmp = tmp->next)
+ {
+ DEBUG_MSG (("Remove empty keyword: %s\n",
+ ephy_node_get_property_string (kid,
+ EPHY_NODE_KEYWORD_PROP_NAME)));
+ g_object_unref (EPHY_NODE (tmp->data));
+ }
+ g_list_free (l);
+
return FALSE;
}