aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-09-13 22:13:11 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-09-14 00:45:01 +0800
commitcbe0d0b4ecbffe71334fa7c25ff49612c521cf3d (patch)
tree2dcae3035fb6d10b651f5ea7bc0651736e28a0a5
parent074c63227fd6bd3ce7bae43135d0ff7e2bf37ba8 (diff)
downloadgsoc2013-empathy-cbe0d0b4ecbffe71334fa7c25ff49612c521cf3d.tar
gsoc2013-empathy-cbe0d0b4ecbffe71334fa7c25ff49612c521cf3d.tar.gz
gsoc2013-empathy-cbe0d0b4ecbffe71334fa7c25ff49612c521cf3d.tar.bz2
gsoc2013-empathy-cbe0d0b4ecbffe71334fa7c25ff49612c521cf3d.tar.lz
gsoc2013-empathy-cbe0d0b4ecbffe71334fa7c25ff49612c521cf3d.tar.xz
gsoc2013-empathy-cbe0d0b4ecbffe71334fa7c25ff49612c521cf3d.tar.zst
gsoc2013-empathy-cbe0d0b4ecbffe71334fa7c25ff49612c521cf3d.zip
Check if the remote-contact is actually there before putting it on the list
-rw-r--r--libempathy/empathy-tp-chat.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index a64f06a2f..a8b0eeb6f 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -164,7 +164,8 @@ tp_chat_get_members (EmpathyContactList *list)
g_list_foreach (members, (GFunc) g_object_ref, NULL);
} else {
members = g_list_prepend (members, g_object_ref (priv->user));
- members = g_list_prepend (members, g_object_ref (priv->remote_contact));
+ if (priv->remote_contact != NULL)
+ members = g_list_prepend (members, g_object_ref (priv->remote_contact));
}
return members;