p/logdiag
1
1
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

Optimize removal from LdCategory.

Browse Source
This commit is contained in:
Přemysl Eric Janouch 2012-08-29 20:57:31 +02:00
parent 9569d96cd6
commit 2156a92a09
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
liblogdiag/ld-category.c
View File

@ -298,12 +298,14 @@ ld_category_insert_symbol (LdCategory *self, LdSymbol *symbol, gint pos)
void void
ld_category_remove_symbol (LdCategory *self, LdSymbol *symbol) ld_category_remove_symbol (LdCategory *self, LdSymbol *symbol)
{ {
GSList *link;
g_return_if_fail (LD_IS_CATEGORY (self)); g_return_if_fail (LD_IS_CATEGORY (self));
g_return_if_fail (LD_IS_SYMBOL (symbol)); g_return_if_fail (LD_IS_SYMBOL (symbol));
if (g_slist_find (self->priv->symbols, symbol)) if ((link = g_slist_find (self->priv->symbols, symbol)))
{ {
self->priv->symbols = g_slist_remove (self->priv->symbols, symbol); self->priv->symbols = g_slist_delete_link (self->priv->symbols, link);
g_object_unref (symbol); g_object_unref (symbol);
} }
} }
@ -390,15 +392,17 @@ ld_category_add_child (LdCategory *self, LdCategory *category)
void void
ld_category_remove_child (LdCategory *self, LdCategory *category) ld_category_remove_child (LdCategory *self, LdCategory *category)
{ {
GSList *link;
g_return_if_fail (LD_IS_CATEGORY (self)); g_return_if_fail (LD_IS_CATEGORY (self));
g_return_if_fail (LD_IS_CATEGORY (category)); g_return_if_fail (LD_IS_CATEGORY (category));
if (g_slist_find (self->priv->subcategories, category)) if ((link = g_slist_find (self->priv->subcategories, category)))
{ {
g_signal_handlers_disconnect_by_func (category, g_signal_handlers_disconnect_by_func (category,
on_category_notify_name, self); on_category_notify_name, self);
self->priv->subcategories self->priv->subcategories
= g_slist_remove (self->priv->subcategories, category); = g_slist_delete_link (self->priv->subcategories, link);
g_object_unref (category); g_object_unref (category);
} }
} }