aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libempathy/empathy-contact.c14
-rw-r--r--libempathy/empathy-contact.h4
-rw-r--r--libempathy/empathy-message.c8
3 files changed, 13 insertions, 13 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;
}
diff --git a/libempathy/empathy-contact.h b/libempathy/empathy-contact.h
index 568ecd537..69c215ad4 100644
--- a/libempathy/empathy-contact.h
+++ b/libempathy/empathy-contact.h
@@ -27,7 +27,7 @@
#include <telepathy-glib/contact.h>
#include <telepathy-glib/account.h>
#ifdef ENABLE_TPL
-#include <telepathy-logger/contact.h>
+#include <telepathy-logger/entity.h>
#endif /* ENABLE_TPL */
G_BEGIN_DECLS
@@ -75,7 +75,7 @@ GType empathy_contact_get_type (void) G_GNUC_CONST;
EmpathyContact * empathy_contact_new (TpContact *tp_contact);
#ifdef ENABLE_TPL
EmpathyContact * empathy_contact_from_tpl_contact (TpAccount *account,
- TplContact *tpl_contact);
+ TplEntity *tpl_contact);
#endif /* ENABLE_TPL */
EmpathyContact * empathy_contact_new_for_log (TpAccount *account,
const gchar *id, const gchar *name, gboolean is_user);
diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index 11a926a42..ab9e95d37 100644
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -31,7 +31,7 @@
#include <telepathy-glib/account.h>
#include <telepathy-glib/account-manager.h>
-#include <telepathy-logger/contact.h>
+#include <telepathy-logger/entity.h>
#include <telepathy-logger/entry.h>
#include <telepathy-logger/entry-text.h>
#endif /* ENABLE_TPL */
@@ -267,8 +267,8 @@ empathy_message_from_tpl_log_entry (TplEntry *logentry)
EmpathyMessage *retval = NULL;
TpAccountManager *acc_man = NULL;
TpAccount *account = NULL;
- TplContact *receiver = NULL;
- TplContact *sender = NULL;
+ TplEntity *receiver = NULL;
+ TplEntity *sender = NULL;
gchar *body= NULL;
g_return_val_if_fail (TPL_IS_ENTRY (logentry), NULL);
@@ -279,7 +279,7 @@ empathy_message_from_tpl_log_entry (TplEntry *logentry)
* When #610455 will be fixed, calling tp_account_manager_ensure_account ()
* might add a not existing account to the AM. tp_account_new () probably
* will be the best way to handle it.
- * Note: When creating an EmpathyContact from a TplContact instance, the
+ * Note: When creating an EmpathyContact from a TplEntity instance, the
* TpAccount is passed *only* to let EmpathyContact be able to retrieve the
* avatar (contact_get_avatar_filename () need a TpAccount).
* If the way EmpathyContact stores the avatar is changes, it might not be