Merge branch 'leak'

svn path=/trunk/; revision=1227

diff --git a/libempathy/empathy-tp-contact-factory.c b/libempathy/empathy-tp-contact-factory.c
index fe68ed0a7d50d188f4ad4eb8442a097f5ee40649..9045a596160aa148839431c1ec5eadd0411e4107 100644 (file)
--- a/libempathy/empathy-tp-contact-factory.c
+++ b/libempathy/empathy-tp-contact-factory.c
@@ -1051,6 +1051,8 @@ empathy_tp_contact_factory_get_from_handles (EmpathyTpContactFactory *tp_factory
                tp_contact_factory_request_everything (tp_factory, new_handles);
        }
 
+       g_array_free (new_handles, TRUE);
+
        return contacts;
 }
 

diff --git a/src/empathy.c b/src/empathy.c
index 5851d41ac8cc646bd3700335922edc548172be2d..89b22b884e5f5fb7904c31c1dae83f0a04c084c9 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -100,6 +100,8 @@ dispatch_channel_cb (EmpathyDispatcher *dispatcher,
        else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA)) {
                empathy_call_window_new (channel);
        }
+
+       g_free (channel_type);
 }
 
 static void