aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy/empathy-contact.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-16 19:24:33 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-06-18 23:18:03 +0800
commit3a2a8251d7b4c79962fd17a978475df5b3cb57a9 (patch)
tree59855dc96eeb28e372e30ad867a7fb30916721cc /libempathy/empathy-contact.c
parent09a49d81dafe86a68546613cfeee4e2a118cf198 (diff)
downloadgsoc2013-empathy-3a2a8251d7b4c79962fd17a978475df5b3cb57a9.tar
gsoc2013-empathy-3a2a8251d7b4c79962fd17a978475df5b3cb57a9.tar.gz
gsoc2013-empathy-3a2a8251d7b4c79962fd17a978475df5b3cb57a9.tar.bz2
gsoc2013-empathy-3a2a8251d7b4c79962fd17a978475df5b3cb57a9.tar.lz
gsoc2013-empathy-3a2a8251d7b4c79962fd17a978475df5b3cb57a9.tar.xz
gsoc2013-empathy-3a2a8251d7b4c79962fd17a978475df5b3cb57a9.tar.zst
gsoc2013-empathy-3a2a8251d7b4c79962fd17a978475df5b3cb57a9.zip
TplContact has been renamed to TplEntity
Diffstat (limited to 'libempathy/empathy-contact.c')
-rw-r--r--libempathy/empathy-contact.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index bd8a63efa..7530730fc 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -482,25 +482,25 @@ empathy_contact_new (TpContact *tp_contact)
#ifdef ENABLE_TPL
EmpathyContact *
empathy_contact_from_tpl_contact (TpAccount *account,
- TplContact *tpl_contact)
+ TplEntity *tpl_entity)
{
EmpathyContact *retval;
gboolean is_user;
- g_return_val_if_fail (TPL_IS_CONTACT (tpl_contact), NULL);
+ g_return_val_if_fail (TPL_IS_ENTITY (tpl_entity), NULL);
- is_user = (TPL_CONTACT_USER == tpl_contact_get_contact_type (tpl_contact));
+ is_user = (TPL_ENTITY_SELF == tpl_entity_get_entity_type (tpl_entity));
retval = g_object_new (EMPATHY_TYPE_CONTACT,
- "id", tpl_contact_get_alias (tpl_contact),
- "name", tpl_contact_get_identifier (tpl_contact),
+ "id", tpl_entity_get_alias (tpl_entity),
+ "name", tpl_entity_get_identifier (tpl_entity),
"account", account,
"is-user", is_user,
NULL);
- if (!EMP_STR_EMPTY (tpl_contact_get_avatar_token (tpl_contact)))
+ if (!EMP_STR_EMPTY (tpl_entity_get_avatar_token (tpl_entity)))
empathy_contact_load_avatar_cache (retval,
- tpl_contact_get_avatar_token (tpl_contact));
+ tpl_entity_get_avatar_token (tpl_entity));
return retval;
}