From 91386d401d9385cf334cf4d879f97d7e49540bb1 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Tue, 1 Feb 2011 16:48:24 +0100 Subject: 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). --- libempathy/empathy-contact.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'libempathy/empathy-contact.c') 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; } -- cgit v1.2.3