[empathy/gnome-2-34] empathy_contact_get_presence_message: use the tp_contact if there is no persona for the contact
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy/gnome-2-34] empathy_contact_get_presence_message: use the tp_contact if there is no persona for the contact
- Date: Tue, 1 Feb 2011 15:54:53 +0000 (UTC)
commit b9d9c5d90b62b0005b609ca3db30162498422c55
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Tue Feb 1 16:48:24 2011 +0100
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 | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 6eaa8c3..1e44a62 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -967,6 +967,9 @@ empathy_contact_get_presence_message (EmpathyContact *contact)
if (priv->persona != NULL)
return folks_presence_get_presence_message (FOLKS_PRESENCE (priv->persona));
+ if (priv->tp_contact != NULL)
+ return tp_contact_get_presence_message (priv->tp_contact);
+
return NULL;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]