diff options
author | Travis Reitter <travis.reitter@collabora.co.uk> | 2011-05-03 08:21:04 +0800 |
---|---|---|
committer | Travis Reitter <travis.reitter@collabora.co.uk> | 2011-06-07 00:30:51 +0800 |
commit | faa40483fd000099a0593c09d0e92b938beaaaa7 (patch) | |
tree | 1373f3c1421aac65ae4259284caf3e09b83b3cf6 /libempathy-gtk/empathy-individual-widget.c | |
parent | a17f14769b6867e240f1f79288ed1d33ec51760b (diff) | |
download | gsoc2013-empathy-faa40483fd000099a0593c09d0e92b938beaaaa7.tar gsoc2013-empathy-faa40483fd000099a0593c09d0e92b938beaaaa7.tar.gz gsoc2013-empathy-faa40483fd000099a0593c09d0e92b938beaaaa7.tar.bz2 gsoc2013-empathy-faa40483fd000099a0593c09d0e92b938beaaaa7.tar.lz gsoc2013-empathy-faa40483fd000099a0593c09d0e92b938beaaaa7.tar.xz gsoc2013-empathy-faa40483fd000099a0593c09d0e92b938beaaaa7.tar.zst gsoc2013-empathy-faa40483fd000099a0593c09d0e92b938beaaaa7.zip |
Don't conflate TpfPersona and FolksPersona.
Diffstat (limited to 'libempathy-gtk/empathy-individual-widget.c')
-rw-r--r-- | libempathy-gtk/empathy-individual-widget.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c index dc45191a6..d0697d261 100644 --- a/libempathy-gtk/empathy-individual-widget.c +++ b/libempathy-gtk/empathy-individual-widget.c @@ -229,20 +229,20 @@ update_weak_contact (EmpathyIndividualWidget *self) for (l = personas; l != NULL; l = l->next) { FolksPresenceDetails *presence; + FolksPresenceType presence_type_cur; - /* We only want personas which implement FolksPresence */ - if (!FOLKS_IS_PRESENCE_DETAILS (l->data)) + /* We only want personas which have presence and a TpContact */ + if (!empathy_folks_persona_is_interesting (FOLKS_PERSONA (presence))) continue; presence = FOLKS_PRESENCE_DETAILS (l->data); + presence_type_cur = folks_presence_details_get_presence_type ( + presence); if (folks_presence_details_typecmp ( - folks_presence_details_get_presence_type (presence), - presence_type) > 0 && - empathy_folks_persona_is_interesting (FOLKS_PERSONA (presence))) + presence_type_cur, presence_type) > 0) { - presence_type = folks_presence_details_get_presence_type ( - presence); + presence_type = presence_type_cur; tp_contact = tpf_persona_get_contact (TPF_PERSONA (l->data)); } } |