aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy/empathy-contact.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-02-01 23:48:24 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-02-01 23:48:26 +0800
commit91386d401d9385cf334cf4d879f97d7e49540bb1 (patch)
treeb157707f8ffdad9849cc605cef52d5057f5f6506 /libempathy/empathy-contact.c
parent796ab375f5ff84b118320f71ea0d1a54f9dcb221 (diff)
downloadgsoc2013-empathy-91386d401d9385cf334cf4d879f97d7e49540bb1.tar
gsoc2013-empathy-91386d401d9385cf334cf4d879f97d7e49540bb1.tar.gz
gsoc2013-empathy-91386d401d9385cf334cf4d879f97d7e49540bb1.tar.bz2
gsoc2013-empathy-91386d401d9385cf334cf4d879f97d7e49540bb1.tar.lz
gsoc2013-empathy-91386d401d9385cf334cf4d879f97d7e49540bb1.tar.xz
gsoc2013-empathy-91386d401d9385cf334cf4d879f97d7e49540bb1.tar.zst
gsoc2013-empathy-91386d401d9385cf334cf4d879f97d7e49540bb1.zip
empathy_contact_get_presence_message: use the tp_contact if there is no persona for the contact
This is needed in muc as channel specific contacts don't have a persona associated with them (#640914).
Diffstat (limited to 'libempathy/empathy-contact.c')
-rw-r--r--libempathy/empathy-contact.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 76091e455..9ae26142a 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -991,10 +991,11 @@ empathy_contact_get_presence_message (EmpathyContact *contact)
priv = GET_PRIV (contact);
if (priv->persona != NULL)
- {
- return folks_presence_owner_get_presence_message (
- FOLKS_PRESENCE_OWNER (priv->persona));
- }
+ return folks_presence_owner_get_presence_message (
+ FOLKS_PRESENCE_OWNER (priv->persona));
+
+ if (priv->tp_contact != NULL)
+ return tp_contact_get_presence_message (priv->tp_contact);
return NULL;
}