aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2008-07-14 17:26:03 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-07-14 17:26:03 +0800
commitcdd5734d839882e04957030bd7af6d00be8f88ce (patch)
tree96e54762aba35939e065d54ead9296a70d93b4b5
parent7af1dee75adc774fedbdf9ec7e473f490528795b (diff)
downloadgsoc2013-empathy-cdd5734d839882e04957030bd7af6d00be8f88ce.tar
gsoc2013-empathy-cdd5734d839882e04957030bd7af6d00be8f88ce.tar.gz
gsoc2013-empathy-cdd5734d839882e04957030bd7af6d00be8f88ce.tar.bz2
gsoc2013-empathy-cdd5734d839882e04957030bd7af6d00be8f88ce.tar.lz
gsoc2013-empathy-cdd5734d839882e04957030bd7af6d00be8f88ce.tar.xz
gsoc2013-empathy-cdd5734d839882e04957030bd7af6d00be8f88ce.tar.zst
gsoc2013-empathy-cdd5734d839882e04957030bd7af6d00be8f88ce.zip
Merge branch 'leak'
svn path=/trunk/; revision=1227
-rw-r--r--libempathy/empathy-tp-contact-factory.c2
-rw-r--r--src/empathy.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/libempathy/empathy-tp-contact-factory.c b/libempathy/empathy-tp-contact-factory.c
index fe68ed0a7..9045a5961 100644
--- 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 5851d41ac..89b22b884 100644
--- 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