diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-02-01 23:48:24 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-02-01 23:54:39 +0800 |
| commit | b9d9c5d90b62b0005b609ca3db30162498422c55 (patch) | |
| tree | 74e51f5b14316a9ca7f0283a64e8fa5b5aab5fc4 | |
| parent | e33077e282cd1c5b727a69fc3c48b8445d3752b4 (diff) | |
| download | gsoc2013-empathy-b9d9c5d90b62b0005b609ca3db30162498422c55.tar gsoc2013-empathy-b9d9c5d90b62b0005b609ca3db30162498422c55.tar.gz gsoc2013-empathy-b9d9c5d90b62b0005b609ca3db30162498422c55.tar.bz2 gsoc2013-empathy-b9d9c5d90b62b0005b609ca3db30162498422c55.tar.lz gsoc2013-empathy-b9d9c5d90b62b0005b609ca3db30162498422c55.tar.xz gsoc2013-empathy-b9d9c5d90b62b0005b609ca3db30162498422c55.tar.zst gsoc2013-empathy-b9d9c5d90b62b0005b609ca3db30162498422c55.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).
| -rw-r--r-- | 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 6eaa8c3cd..1e44a62da 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; } |