summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-09-24 12:08:12 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-09-24 12:08:12 +0100
commitbfd5bff8412cfb286a346a15b07535002673af19 (patch)
treebed3e97dfa9a1e1808bec8776d8a5893ddbc8247
parent454aa14650d6f54d08ada40811ffb55b21d90bbe (diff)
parent5ebdcd4ced55abc121cc0b796a01a943e3bf040f (diff)
Merge branch 'telepathy-haze-0.8'
Conflicts: NEWS
-rw-r--r--NEWS5
-rw-r--r--src/contact-list.c2
-rw-r--r--src/im-channel.c2
3 files changed, 8 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index ea11e0f..1aeff83 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,11 @@ Fixes:
an error, and don't crash if libpurple reports a "primitive status"
that we don't understand (fd.o #69474, Simon)
+• Fix a memory leak when IM channels are closed (fd.o #31723, Simon)
+
+• Fix ContactGroups.SetContactGroups() implementation so it removes
+ the contact from groups if desired (fd.o #49389, Simon)
+
telepathy-haze 0.7.1 (2013-09-17)
=================================
diff --git a/src/contact-list.c b/src/contact-list.c
index 107f9e9..7397c1d 100644
--- a/src/contact-list.c
+++ b/src/contact-list.c
@@ -1023,7 +1023,7 @@ haze_contact_list_set_contact_groups_async (TpBaseContactList *cl,
for (i = 0; i < n_names; i++)
{
- if (tp_strdiff (group_name, names[i]))
+ if (!tp_strdiff (group_name, names[i]))
{
desired = TRUE;
break;
diff --git a/src/im-channel.c b/src/im-channel.c
index 743eb9b..f74004d 100644
--- a/src/im-channel.c
+++ b/src/im-channel.c
@@ -608,6 +608,8 @@ haze_im_channel_dispose (GObject *obj)
g_free (priv->object_path);
tp_message_mixin_finalize (obj);
+
+ G_OBJECT_CLASS (haze_im_channel_parent_class)->dispose (obj);
}
static void