TpHandleType has been renamed to TpEntityType

11 files changed, 54 insertions, 54 deletions

diff --git a/src/connection-aliasing.c b/src/connection-aliasing.c
index 510e815..aca47ab 100644
--- a/src/connection-aliasing.c
+++ b/src/connection-aliasing.c
@@ -99,7 +99,7 @@ get_alias (HazeConnection *self,
 {
     TpBaseConnection *base = TP_BASE_CONNECTION (self);
     TpHandleRepoIface *contact_handles =
-        tp_base_connection_get_handles (base, TP_HANDLE_TYPE_CONTACT);
+        tp_base_connection_get_handles (base, TP_ENTITY_TYPE_CONTACT);
     const gchar *bname = tp_handle_inspect (contact_handles, handle);
     const gchar *alias;
 
@@ -139,7 +139,7 @@ haze_connection_request_aliases (TpSvcConnectionInterfaceAliasing1 *self,
     HazeConnection *conn = HAZE_CONNECTION (self);
     TpBaseConnection *base = TP_BASE_CONNECTION (conn);
     TpHandleRepoIface *contact_handles =
-        tp_base_connection_get_handles (base, TP_HANDLE_TYPE_CONTACT);
+        tp_base_connection_get_handles (base, TP_ENTITY_TYPE_CONTACT);
     guint i;
     GError *error = NULL;
     const gchar **aliases;
@@ -274,7 +274,7 @@ haze_connection_set_aliases (TpSvcConnectionInterfaceAliasing1 *self,
     GError *error = NULL;
     struct _g_hash_table_foreach_all_in_my_brain data = { conn, NULL, &error };
     data.contact_handles =
-        tp_base_connection_get_handles (base, TP_HANDLE_TYPE_CONTACT);
+        tp_base_connection_get_handles (base, TP_ENTITY_TYPE_CONTACT);
 
     if (!can_alias (conn))
     {
@@ -330,7 +330,7 @@ blist_node_aliased_cb (PurpleBlistNode *node,
     buddy = (PurpleBuddy *)node;
     base_conn = ACCOUNT_GET_TP_BASE_CONNECTION (buddy->account);
     contact_handles =
-        tp_base_connection_get_handles (base_conn, TP_HANDLE_TYPE_CONTACT);
+        tp_base_connection_get_handles (base_conn, TP_ENTITY_TYPE_CONTACT);
     handle = tp_handle_ensure (contact_handles, buddy->name, NULL, NULL);
 
     aliases = g_hash_table_new (NULL, NULL);
diff --git a/src/connection-avatars.c b/src/connection-avatars.c
index 53d1c17..af266b1 100644
--- a/src/connection-avatars.c
+++ b/src/connection-avatars.c
@@ -197,7 +197,7 @@ get_avatar (HazeConnection *conn,
     GArray *avatar = NULL;
     TpBaseConnection *base = TP_BASE_CONNECTION (conn);
     TpHandleRepoIface *contact_handles =
-        tp_base_connection_get_handles (base, TP_HANDLE_TYPE_CONTACT);
+        tp_base_connection_get_handles (base, TP_ENTITY_TYPE_CONTACT);
     gconstpointer icon_data = NULL;
     size_t icon_size = 0;
 
@@ -294,7 +294,7 @@ haze_connection_get_known_avatar_tokens (TpSvcConnectionInterfaceAvatars1 *self,
     GError *err = NULL;
 
     TpHandleRepoIface *contact_repo =
-        tp_base_connection_get_handles (base_conn, TP_HANDLE_TYPE_CONTACT);
+        tp_base_connection_get_handles (base_conn, TP_ENTITY_TYPE_CONTACT);
 
     if (!tp_handles_are_valid (contact_repo, contacts, FALSE, &err))
     {
@@ -490,7 +490,7 @@ buddy_icon_changed_cb (PurpleBuddy *buddy,
     HazeConnection *conn = ACCOUNT_GET_HAZE_CONNECTION (buddy->account);
     TpBaseConnection *base_conn = TP_BASE_CONNECTION (conn);
     TpHandleRepoIface *contact_repo =
-        tp_base_connection_get_handles (base_conn, TP_HANDLE_TYPE_CONTACT);
+        tp_base_connection_get_handles (base_conn, TP_ENTITY_TYPE_CONTACT);
 
     const char* bname = purple_buddy_get_name (buddy);
     TpHandle contact = tp_handle_ensure (contact_repo, bname, NULL, NULL);
diff --git a/src/connection-capabilities.c b/src/connection-capabilities.c
index 1195c1f..0d7c1b9 100644
--- a/src/connection-capabilities.c
+++ b/src/connection-capabilities.c
@@ -52,7 +52,7 @@ haze_connection_get_handle_contact_capabilities (HazeConnection *self,
   GValue monster = {0, };
   GHashTable *fixed_properties;
   GValue *channel_type_value;
-  GValue *target_handle_type_value;
+  GValue *target_entity_type_value;
   const gchar * const text_allowed_properties[] = {
     TP_PROP_CHANNEL_TARGET_HANDLE, NULL };
 
@@ -77,10 +77,10 @@ haze_connection_get_handle_contact_capabilities (HazeConnection *self,
   g_hash_table_insert (fixed_properties, TP_IFACE_CHANNEL ".ChannelType",
       channel_type_value);
 
-  target_handle_type_value = tp_g_value_slice_new (G_TYPE_UINT);
-  g_value_set_uint (target_handle_type_value, TP_HANDLE_TYPE_CONTACT);
-  g_hash_table_insert (fixed_properties, TP_IFACE_CHANNEL ".TargetHandleType",
-      target_handle_type_value);
+  target_entity_type_value = tp_g_value_slice_new (G_TYPE_UINT);
+  g_value_set_uint (target_entity_type_value, TP_ENTITY_TYPE_CONTACT);
+  g_hash_table_insert (fixed_properties, TP_IFACE_CHANNEL ".TargetEntityType",
+      target_entity_type_value);
 
   dbus_g_type_struct_set (&monster,
       0, fixed_properties,
diff --git a/src/connection-presence.c b/src/connection-presence.c
index f00aa10..3f66806 100644
--- a/src/connection-presence.c
+++ b/src/connection-presence.c
@@ -169,7 +169,7 @@ _get_contact_status (GObject *obj,
     HazeConnection *conn = HAZE_CONNECTION (obj);
     TpBaseConnection *base_conn = TP_BASE_CONNECTION (obj);
     TpHandleRepoIface *handle_repo =
-        tp_base_connection_get_handles (base_conn, TP_HANDLE_TYPE_CONTACT);
+        tp_base_connection_get_handles (base_conn, TP_ENTITY_TYPE_CONTACT);
     PurpleStatus *p_status;
 
     g_assert (tp_handle_is_valid (handle_repo, handle, NULL));
@@ -232,7 +232,7 @@ update_status (PurpleBuddy *buddy,
     HazeConnection *conn = ACCOUNT_GET_HAZE_CONNECTION (account);
     TpBaseConnection *base_conn = TP_BASE_CONNECTION (conn);
     TpHandleRepoIface *handle_repo =
-        tp_base_connection_get_handles (base_conn, TP_HANDLE_TYPE_CONTACT);
+        tp_base_connection_get_handles (base_conn, TP_ENTITY_TYPE_CONTACT);
 
     const gchar *bname = purple_buddy_get_name (buddy);
     TpHandle handle = tp_handle_ensure (handle_repo, bname, NULL, NULL);
diff --git a/src/connection.c b/src/connection.c
index 1d5cda8..20284e5 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -541,7 +541,7 @@ _haze_connection_start_connecting (TpBaseConnection *base,
     HazeConnection *self = HAZE_CONNECTION(base);
     HazeConnectionPrivate *priv = self->priv;
     TpHandleRepoIface *contact_handles =
-        tp_base_connection_get_handles (base, TP_HANDLE_TYPE_CONTACT);
+        tp_base_connection_get_handles (base, TP_ENTITY_TYPE_CONTACT);
     const gchar *password;
     TpHandle self_handle;
 
@@ -640,12 +640,12 @@ _contact_normalize (TpHandleRepoIface *repo,
 
 static void
 _haze_connection_create_handle_repos (TpBaseConnection *base,
-        TpHandleRepoIface *repos[TP_NUM_HANDLE_TYPES])
+        TpHandleRepoIface *repos[TP_NUM_ENTITY_TYPES])
 {
-    repos[TP_HANDLE_TYPE_CONTACT] =
-        tp_dynamic_handle_repo_new (TP_HANDLE_TYPE_CONTACT, _contact_normalize,
+    repos[TP_ENTITY_TYPE_CONTACT] =
+        tp_dynamic_handle_repo_new (TP_ENTITY_TYPE_CONTACT, _contact_normalize,
                                     base);
-    /* repos[TP_HANDLE_TYPE_ROOM] = XXX MUC */
+    /* repos[TP_ENTITY_TYPE_ROOM] = XXX MUC */
 }
 
 static GPtrArray *
@@ -981,7 +981,7 @@ haze_get_connection_ui_ops ()
 
 const gchar *
 haze_connection_handle_inspect (HazeConnection *conn,
-                                TpHandleType handle_type,
+                                TpEntityType handle_type,
                                 TpHandle handle)
 {
     TpBaseConnection *base_conn = TP_BASE_CONNECTION (conn);
diff --git a/src/connection.h b/src/connection.h
index 2046add..9720429 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -70,7 +70,7 @@ PurpleConnectionUiOps *haze_get_connection_ui_ops (void);
 
 const gchar *
 haze_connection_handle_inspect (HazeConnection *conn,
-                                TpHandleType handle_type,
+                                TpEntityType handle_type,
                                 TpHandle handle);
 
 gboolean haze_connection_create_account (HazeConnection *self, GError **error);
diff --git a/src/contact-list.c b/src/contact-list.c
index ac19443..12ac5fc 100644
--- a/src/contact-list.c
+++ b/src/contact-list.c
@@ -124,7 +124,7 @@ haze_contact_list_constructor (GType type, guint n_props,
     /* not reffed, for the moment */
 
     contact_repo = tp_base_connection_get_handles (
-        (TpBaseConnection *) self->priv->conn, TP_HANDLE_TYPE_CONTACT);
+        (TpBaseConnection *) self->priv->conn, TP_ENTITY_TYPE_CONTACT);
 
     self->priv->publishing_to = tp_handle_set_new (contact_repo);
     self->priv->not_publishing_to = tp_handle_set_new (contact_repo);
@@ -175,7 +175,7 @@ haze_contact_list_dup_contacts (TpBaseContactList *cl)
   HazeContactList *self = HAZE_CONTACT_LIST (cl);
   TpBaseConnection *base_conn = TP_BASE_CONNECTION (self->priv->conn);
   TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (base_conn,
-      TP_HANDLE_TYPE_CONTACT);
+      TP_ENTITY_TYPE_CONTACT);
   /* The list initially contains anyone we're definitely publishing to.
    * Because libpurple, that's only people whose request we accepted during
    * this session :-( */
@@ -217,7 +217,7 @@ haze_contact_list_dup_states (TpBaseContactList *cl,
 {
   HazeContactList *self = HAZE_CONTACT_LIST (cl);
   const gchar *bname = haze_connection_handle_inspect (self->priv->conn,
-      TP_HANDLE_TYPE_CONTACT, contact);
+      TP_ENTITY_TYPE_CONTACT, contact);
   PurpleBuddy *buddy = purple_find_buddy (self->priv->conn->account, bname);
   TpSubscriptionState pub, sub;
   PublishRequestData *pub_req = g_hash_table_lookup (
@@ -296,7 +296,7 @@ buddy_added_cb (PurpleBuddy *buddy, gpointer unused)
     HazeContactList *contact_list = conn->contact_list;
     TpBaseConnection *base_conn = TP_BASE_CONNECTION (conn);
     TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
-        base_conn, TP_HANDLE_TYPE_CONTACT);
+        base_conn, TP_ENTITY_TYPE_CONTACT);
     const gchar *name = purple_buddy_get_name (buddy);
     TpHandle handle = tp_handle_ensure (contact_repo, name, NULL, NULL);
     const char *group_name;
@@ -330,7 +330,7 @@ buddy_removed_cb (PurpleBuddy *buddy, gpointer unused)
 
     contact_list = conn->contact_list;
     contact_repo = tp_base_connection_get_handles (base_conn,
-        TP_HANDLE_TYPE_CONTACT);
+        TP_ENTITY_TYPE_CONTACT);
 
     buddy_name = purple_buddy_get_name (buddy);
     handle = tp_handle_ensure (contact_repo, buddy_name, NULL, NULL);
@@ -393,7 +393,7 @@ haze_contact_list_accept_publish_request (HazeContactList *self,
   PublishRequestData *request_data = g_hash_table_lookup (
       self->priv->pending_publish_requests, key);
   const gchar *bname = haze_connection_handle_inspect (self->priv->conn,
-      TP_HANDLE_TYPE_CONTACT, handle);
+      TP_ENTITY_TYPE_CONTACT, handle);
 
   if (request_data == NULL)
     return;
@@ -435,7 +435,7 @@ haze_contact_list_reject_publish_request (HazeContactList *self,
   PublishRequestData *request_data = g_hash_table_lookup (
       self->priv->pending_publish_requests, key);
   const gchar *bname = haze_connection_handle_inspect (self->priv->conn,
-      TP_HANDLE_TYPE_CONTACT, handle);
+      TP_ENTITY_TYPE_CONTACT, handle);
 
   if (request_data == NULL)
     return;
@@ -465,7 +465,7 @@ haze_request_authorize (PurpleAccount *account,
     HazeConnection *conn = account->ui_data;
     TpBaseConnection *base_conn = TP_BASE_CONNECTION (conn);
     TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (base_conn,
-        TP_HANDLE_TYPE_CONTACT);
+        TP_ENTITY_TYPE_CONTACT);
     HazeContactList *self = conn->contact_list;
     TpHandle remote_handle;
     PublishRequestData *request_data = publish_request_data_new ();
@@ -526,7 +526,7 @@ haze_contact_list_request_subscription (HazeContactList *self,
 {
   PurpleAccount *account = self->priv->conn->account;
   const gchar *bname = haze_connection_handle_inspect (self->priv->conn,
-      TP_HANDLE_TYPE_CONTACT, handle);
+      TP_ENTITY_TYPE_CONTACT, handle);
   PurpleBuddy *buddy;
 
   /* If the buddy already exists, then it should already be on the
@@ -580,7 +580,7 @@ haze_contact_list_remove_contact (HazeContactList *self,
 {
   PurpleAccount *account = self->priv->conn->account;
   const gchar *bname = haze_connection_handle_inspect (self->priv->conn,
-      TP_HANDLE_TYPE_CONTACT, handle);
+      TP_ENTITY_TYPE_CONTACT, handle);
   GSList *buddies, *l;
 
   buddies = purple_find_buddies (account, bname);
@@ -630,7 +630,7 @@ haze_contact_list_add_to_group (HazeContactList *self,
 {
     HazeConnection *conn = self->priv->conn;
     const gchar *bname =
-        haze_connection_handle_inspect (conn, TP_HANDLE_TYPE_CONTACT, handle);
+        haze_connection_handle_inspect (conn, TP_ENTITY_TYPE_CONTACT, handle);
     PurpleBuddy *buddy;
     /* This actually has "ensure" semantics, and doesn't return a ref */
     PurpleGroup *group = purple_group_new (group_name);
@@ -665,7 +665,7 @@ haze_contact_list_prep_remove_from_group (HazeContactList *self,
   HazeConnection *conn = self->priv->conn;
   TpBaseConnection *base_conn = TP_BASE_CONNECTION (conn);
   TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (base_conn,
-      TP_HANDLE_TYPE_CONTACT);
+      TP_ENTITY_TYPE_CONTACT);
   PurpleAccount *account = conn->account;
   PurpleGroup *group = purple_find_group (group_name);
   TpIntsetFastIter iter;
@@ -687,7 +687,7 @@ haze_contact_list_prep_remove_from_group (HazeContactList *self,
       GSList *buddies;
       GSList *l;
       const gchar *bname =
-          haze_connection_handle_inspect (conn, TP_HANDLE_TYPE_CONTACT,
+          haze_connection_handle_inspect (conn, TP_ENTITY_TYPE_CONTACT,
               handle);
 
       g_assert (bname != NULL);
@@ -736,7 +736,7 @@ haze_contact_list_prep_remove_from_group (HazeContactList *self,
       while (tp_intset_fast_iter_next (&iter, &handle))
         {
           const gchar *bname =
-              haze_connection_handle_inspect (conn, TP_HANDLE_TYPE_CONTACT,
+              haze_connection_handle_inspect (conn, TP_ENTITY_TYPE_CONTACT,
                   handle);
 
           PurpleBuddy *copy = purple_buddy_new (conn->account, bname, NULL);
@@ -769,7 +769,7 @@ haze_contact_list_remove_many_from_group (HazeContactList *self,
       GSList *buddies;
       GSList *l;
       const gchar *bname = haze_connection_handle_inspect (self->priv->conn,
-          TP_HANDLE_TYPE_CONTACT, handle);
+          TP_ENTITY_TYPE_CONTACT, handle);
 
       buddies = purple_find_buddies (account, bname);
 
@@ -796,7 +796,7 @@ haze_contact_list_remove_from_group (HazeContactList *self,
 {
   TpBaseConnection *base_conn = TP_BASE_CONNECTION (self->priv->conn);
   TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (base_conn,
-      TP_HANDLE_TYPE_CONTACT);
+      TP_ENTITY_TYPE_CONTACT);
   gboolean ok;
   TpHandleSet *contacts = tp_handle_set_new_containing (contact_repo, handle);
 
@@ -863,7 +863,7 @@ haze_contact_list_dup_contact_groups (TpBaseContactList *cl,
 {
   HazeContactList *self = HAZE_CONTACT_LIST (cl);
   const gchar *bname = haze_connection_handle_inspect (self->priv->conn,
-      TP_HANDLE_TYPE_CONTACT, contact);
+      TP_ENTITY_TYPE_CONTACT, contact);
   GSList *buddies, *sl_iter;
   GPtrArray *arr;
 
@@ -892,7 +892,7 @@ haze_contact_list_dup_group_members (TpBaseContactList *cl,
   HazeContactList *self = HAZE_CONTACT_LIST (cl);
   TpBaseConnection *base_conn = TP_BASE_CONNECTION (self->priv->conn);
   TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (base_conn,
-      TP_HANDLE_TYPE_CONTACT);
+      TP_ENTITY_TYPE_CONTACT);
   PurpleGroup *group = purple_find_group (group_name);
   PurpleBlistNode *contact, *buddy;
   TpHandleSet *members = tp_handle_set_new (contact_repo);
@@ -994,7 +994,7 @@ haze_contact_list_set_contact_groups_async (TpBaseContactList *cl,
   PurpleAccount *account = self->priv->conn->account;
   const gchar *fallback_group;
   const gchar *bname = haze_connection_handle_inspect (self->priv->conn,
-      TP_HANDLE_TYPE_CONTACT, contact);
+      TP_ENTITY_TYPE_CONTACT, contact);
   gsize i;
   GSList *buddies, *l;
 
@@ -1221,7 +1221,7 @@ is_blocked (TpBaseContactList *cl,
   PurpleAccount *account = self->priv->conn->account;
   TpBaseConnection *base_conn = TP_BASE_CONNECTION (self->priv->conn);
   TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (base_conn,
-      TP_HANDLE_TYPE_CONTACT);
+      TP_ENTITY_TYPE_CONTACT);
   GSList *l;
 
   for (l = account->deny; l != NULL; l = l->next)
@@ -1242,7 +1242,7 @@ dup_blocked_contacts (TpBaseContactList *cl)
   PurpleAccount *account = self->priv->conn->account;
   TpBaseConnection *base_conn = TP_BASE_CONNECTION (self->priv->conn);
   TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (base_conn,
-      TP_HANDLE_TYPE_CONTACT);
+      TP_ENTITY_TYPE_CONTACT);
   TpHandleSet *blocked = tp_handle_set_new (contact_repo);
   GSList *l;
 
@@ -1271,7 +1271,7 @@ set_contacts_privacy (TpBaseContactList *cl,
   while (tp_intset_fast_iter_next (&iter, &handle))
     {
       const gchar *bname = haze_connection_handle_inspect (self->priv->conn,
-          TP_HANDLE_TYPE_CONTACT, handle);
+          TP_ENTITY_TYPE_CONTACT, handle);
 
       if (block)
         purple_privacy_deny (account, bname, FALSE, FALSE);
@@ -1333,7 +1333,7 @@ haze_contact_list_deny_changed (
   HazeConnection *conn = ACCOUNT_GET_HAZE_CONNECTION (account);
   TpBaseConnection *base_conn = TP_BASE_CONNECTION (conn);
   TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (base_conn,
-      TP_HANDLE_TYPE_CONTACT);
+      TP_ENTITY_TYPE_CONTACT);
   GError *error = NULL;
   TpHandle handle = tp_handle_ensure (contact_repo, name, NULL, &error);
   TpHandleSet *set;
diff --git a/src/im-channel-factory.c b/src/im-channel-factory.c
index f63142d..2027b70 100644
--- a/src/im-channel-factory.c
+++ b/src/im-channel-factory.c
@@ -424,7 +424,7 @@ haze_create_conversation (PurpleConversation *conv)
         ACCOUNT_GET_HAZE_CONNECTION (account)->im_factory;
     TpBaseConnection *base_conn = TP_BASE_CONNECTION (im_factory->priv->conn);
     TpHandleRepoIface *contact_repo =
-        tp_base_connection_get_handles (base_conn, TP_HANDLE_TYPE_CONTACT);
+        tp_base_connection_get_handles (base_conn, TP_ENTITY_TYPE_CONTACT);
 
     const gchar *who = purple_conversation_get_name (conv);
 
@@ -504,7 +504,7 @@ haze_get_conv_ui_ops(void)
 
 static const gchar * const fixed_properties[] = {
     TP_IFACE_CHANNEL ".ChannelType",
-    TP_IFACE_CHANNEL ".TargetHandleType",
+    TP_IFACE_CHANNEL ".TargetEntityType",
     NULL
 };
 static const gchar * const allowed_properties[] = {
@@ -527,8 +527,8 @@ haze_im_channel_factory_foreach_channel_class (TpChannelManager *manager,
     g_hash_table_insert (table, TP_IFACE_CHANNEL ".ChannelType", value);
 
     value = tp_g_value_slice_new (G_TYPE_UINT);
-    g_value_set_uint (value, TP_HANDLE_TYPE_CONTACT);
-    g_hash_table_insert (table, TP_IFACE_CHANNEL ".TargetHandleType", value);
+    g_value_set_uint (value, TP_ENTITY_TYPE_CONTACT);
+    g_hash_table_insert (table, TP_IFACE_CHANNEL ".TargetEntityType", value);
 
     func (manager, table, allowed_properties, user_data);
 
@@ -555,7 +555,7 @@ haze_im_channel_factory_request (HazeImChannelFactory *self,
     }
 
     if (tp_asv_get_uint32 (request_properties,
-        TP_IFACE_CHANNEL ".TargetHandleType", NULL) != TP_HANDLE_TYPE_CONTACT)
+        TP_IFACE_CHANNEL ".TargetEntityType", NULL) != TP_ENTITY_TYPE_CONTACT)
     {
         return FALSE;
     }
diff --git a/src/im-channel.c b/src/im-channel.c
index 7321ff6..a5eb2d6 100644
--- a/src/im-channel.c
+++ b/src/im-channel.c
@@ -441,7 +441,7 @@ haze_im_channel_class_init (HazeIMChannelClass *klass)
 
     base_class->channel_type = TP_IFACE_CHANNEL_TYPE_TEXT;
     base_class->get_interfaces = haze_im_channel_get_interfaces;
-    base_class->target_handle_type = TP_HANDLE_TYPE_CONTACT;
+    base_class->target_entity_type = TP_ENTITY_TYPE_CONTACT;
     base_class->close = haze_im_channel_close;
     base_class->fill_immutable_properties =
         haze_im_channel_fill_immutable_properties;
@@ -469,7 +469,7 @@ haze_im_channel_start (HazeIMChannel *self)
     HazeConnection *conn = HAZE_CONNECTION (base_conn);
 
     contact_handles = tp_base_connection_get_handles (base_conn,
-        TP_HANDLE_TYPE_CONTACT);
+        TP_ENTITY_TYPE_CONTACT);
     recipient = tp_handle_inspect (contact_handles,
         tp_base_channel_get_target_handle (base));
     priv->conv = purple_conversation_new (PURPLE_CONV_TYPE_IM,
diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py
index d710529..9c12bd1 100644
--- a/tests/twisted/constants.py
+++ b/tests/twisted/constants.py
@@ -63,7 +63,7 @@ CHANNEL_TYPE_SERVER_TLS_CONNECTION = \
     CHANNEL + ".Type.ServerTLSConnection1"
 
 CHANNEL_TYPE = CHANNEL + '.ChannelType'
-TARGET_HANDLE_TYPE = CHANNEL + '.TargetHandleType'
+TARGET_HANDLE_TYPE = CHANNEL + '.TargetEntityType'
 TARGET_HANDLE = CHANNEL + '.TargetHandle'
 TARGET_ID = CHANNEL + '.TargetID'
 REQUESTED = CHANNEL + '.Requested'
diff --git a/tests/twisted/text/test-text.py b/tests/twisted/text/test-text.py
index ba2f7d4..2639465 100644
--- a/tests/twisted/text/test-text.py
+++ b/tests/twisted/text/test-text.py
@@ -33,8 +33,8 @@ def test(q, bus, conn, stream):
     channel_props = text_chan.GetAll(cs.CHANNEL,
             dbus_interface=dbus.PROPERTIES_IFACE)
     assertEquals(foo_at_bar_dot_com_handle, channel_props.get('TargetHandle'))
-    assert channel_props.get('TargetHandleType') == 1,\
-            channel_props.get('TargetHandleType')
+    assert channel_props.get('TargetEntityType') == 1,\
+            channel_props.get('TargetEntityType')
     assertEquals(cs.CHANNEL_TYPE_TEXT, channel_props.get('ChannelType'))
     assertContains(cs.CHANNEL_IFACE_CHAT_STATE,
             channel_props.get('Interfaces', ()))