From 35b9f0c90f66e81f5008ff866b5b4b4b47aae0a5 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Fri, 18 Oct 2013 14:26:43 +0100 Subject: libempathy: Fix several memory leaks from libgee See commit 039dc326208e02b687e93739434e27a867f4ffa7. https://bugzilla.gnome.org/show_bug.cgi?id=710453 --- libempathy/empathy-individual-manager.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'libempathy/empathy-individual-manager.c') diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c index b3797c3b6..c56f6bb16 100644 --- a/libempathy/empathy-individual-manager.c +++ b/libempathy/empathy-individual-manager.c @@ -394,7 +394,7 @@ aggregator_individuals_changed_cb (FolksIndividualAggregator *aggregator, /* Make sure we handle each added individual only once. */ if (ind == NULL || g_list_find (added_set, ind) != NULL) - continue; + goto while_next; added_set = g_list_prepend (added_set, ind); g_signal_connect (ind, "notify::personas", @@ -406,6 +406,7 @@ aggregator_individuals_changed_cb (FolksIndividualAggregator *aggregator, added_filtered = g_list_prepend (added_filtered, ind); } +while_next: g_clear_object (&ind); } g_clear_object (&iter); @@ -829,19 +830,21 @@ empathy_individual_manager_set_blocked (EmpathyIndividualManager *self, tp_contact = tpf_persona_get_contact (persona); if (tp_contact == NULL) - continue; + goto while_next; conn = tp_contact_get_connection (tp_contact); if (!tp_proxy_has_interface_by_id (conn, TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_BLOCKING)) - continue; + goto while_next; if (blocked) tp_contact_block_async (tp_contact, abusive, NULL, NULL); else tp_contact_unblock_async (tp_contact, NULL, NULL); } + +while_next: g_clear_object (&persona); } g_clear_object (&iter); -- cgit v1.2.3