TpHandleType has been renamed to TpEntityType

13 files changed, 51 insertions, 51 deletions

diff --git a/src/idle-connection.c b/src/idle-connection.c
index e123f7f..9c02ade 100644
--- a/src/idle-connection.c
+++ b/src/idle-connection.c
@@ -553,7 +553,7 @@ static GPtrArray *_iface_create_channel_managers(TpBaseConnection *base) {
 }
 
 static void _iface_create_handle_repos(TpBaseConnection *self, TpHandleRepoIface **repos) {
-	for (int i = 0; i < TP_NUM_HANDLE_TYPES; i++)
+	for (int i = 0; i < TP_NUM_ENTITY_TYPES; i++)
 		repos[i] = NULL;
 
 	idle_handle_repos_init(repos);
@@ -1072,7 +1072,7 @@ static IdleParserHandlerResult _nick_handler(IdleParser *parser, IdleParserMessa
 
 	tp_svc_connection_interface_renaming1_emit_renamed(conn, old_handle, new_handle,
 		tp_handle_inspect (tp_base_connection_get_handles (
-			TP_BASE_CONNECTION (conn), TP_HANDLE_TYPE_CONTACT), new_handle));
+			TP_BASE_CONNECTION (conn), TP_ENTITY_TYPE_CONTACT), new_handle));
 
 	idle_connection_emit_queued_aliases_changed(conn);
 
@@ -1138,7 +1138,7 @@ static IdleParserHandlerResult _version_privmsg_handler(IdleParser *parser, Idle
 		return IDLE_PARSER_HANDLER_RESULT_NOT_HANDLED;
 
 	handle = g_value_get_uint(g_value_array_get_nth(args, 0));
-	nick = tp_handle_inspect(tp_base_connection_get_handles(TP_BASE_CONNECTION(conn), TP_HANDLE_TYPE_CONTACT), handle);
+	nick = tp_handle_inspect(tp_base_connection_get_handles(TP_BASE_CONNECTION(conn), TP_ENTITY_TYPE_CONTACT), handle);
 	reply = g_strdup_printf("VERSION telepathy-idle %s Telepathy IM/VoIP Framework http://telepathy.freedesktop.org", VERSION);
 
 	idle_ctcp_notice(nick, reply, conn);
@@ -1254,7 +1254,7 @@ _queue_alias_changed(IdleConnection *conn, TpHandle handle, const gchar *alias)
 	IdleConnectionPrivate *priv = conn->priv;
 
 	if (!priv->queued_aliases_owners) {
-		TpHandleRepoIface *handles = tp_base_connection_get_handles(TP_BASE_CONNECTION(conn), TP_HANDLE_TYPE_CONTACT);
+		TpHandleRepoIface *handles = tp_base_connection_get_handles(TP_BASE_CONNECTION(conn), TP_ENTITY_TYPE_CONTACT);
 		priv->queued_aliases_owners = tp_handle_set_new(handles);
 	}
 
@@ -1268,7 +1268,7 @@ _queue_alias_changed(IdleConnection *conn, TpHandle handle, const gchar *alias)
 }
 
 void idle_connection_canon_nick_receive(IdleConnection *conn, TpHandle handle, const gchar *canon_nick) {
-	TpHandleRepoIface *handles = tp_base_connection_get_handles(TP_BASE_CONNECTION(conn), TP_HANDLE_TYPE_CONTACT);
+	TpHandleRepoIface *handles = tp_base_connection_get_handles(TP_BASE_CONNECTION(conn), TP_ENTITY_TYPE_CONTACT);
 	const gchar *old_alias = g_hash_table_lookup (conn->priv->aliases, GUINT_TO_POINTER (handle));
 
 	if (!old_alias)
@@ -1320,7 +1320,7 @@ conn_aliasing_fill_contact_attributes (IdleConnection *self,
   if (!tp_strdiff (dbus_interface, TP_IFACE_CONNECTION_INTERFACE_ALIASING1))
     {
       TpHandleRepoIface *repo = tp_base_connection_get_handles (
-          TP_BASE_CONNECTION (self), TP_HANDLE_TYPE_CONTACT);
+          TP_BASE_CONNECTION (self), TP_ENTITY_TYPE_CONTACT);
       const gchar *alias = gimme_an_alias (self, repo, handle);
 
       g_assert (alias != NULL);
@@ -1337,7 +1337,7 @@ conn_aliasing_fill_contact_attributes (IdleConnection *self,
 
 static void idle_connection_request_aliases(TpSvcConnectionInterfaceAliasing1 *iface, const GArray *handles, DBusGMethodInvocation *context) {
 	IdleConnection *self = IDLE_CONNECTION (iface);
-	TpHandleRepoIface *repo = tp_base_connection_get_handles(TP_BASE_CONNECTION(iface), TP_HANDLE_TYPE_CONTACT);
+	TpHandleRepoIface *repo = tp_base_connection_get_handles(TP_BASE_CONNECTION(iface), TP_ENTITY_TYPE_CONTACT);
 	GError *error = NULL;
 	const gchar **aliases;
 
@@ -1359,7 +1359,7 @@ static void idle_connection_request_aliases(TpSvcConnectionInterfaceAliasing1 *i
 }
 
 static gboolean _send_rename_request(IdleConnection *obj, const gchar *nick, DBusGMethodInvocation *context) {
-	TpHandleRepoIface *handles = tp_base_connection_get_handles(TP_BASE_CONNECTION(obj), TP_HANDLE_TYPE_CONTACT);
+	TpHandleRepoIface *handles = tp_base_connection_get_handles(TP_BASE_CONNECTION(obj), TP_ENTITY_TYPE_CONTACT);
 	TpHandle handle = tp_handle_ensure(handles, nick, NULL, NULL);
 	gchar msg[IRC_MSG_MAXLEN + 1];
 
diff --git a/src/idle-contact-info.c b/src/idle-contact-info.c
index 72a44d6..2245d4a 100644
--- a/src/idle-contact-info.c
+++ b/src/idle-contact-info.c
@@ -126,7 +126,7 @@ static void _return_from_request_contact_info(IdleConnection *conn) {
 static void idle_connection_request_contact_info(TpSvcConnectionInterfaceContactInfo1 *iface, guint contact, DBusGMethodInvocation *context) {
 	IdleConnection *self = IDLE_CONNECTION(iface);
 	TpBaseConnection *base = TP_BASE_CONNECTION(self);
-	TpHandleRepoIface *contact_handles = tp_base_connection_get_handles(base, TP_HANDLE_TYPE_CONTACT);
+	TpHandleRepoIface *contact_handles = tp_base_connection_get_handles(base, TP_ENTITY_TYPE_CONTACT);
 	const gchar *nick;
 	GError *error = NULL;
 
@@ -205,7 +205,7 @@ static IdleParserHandlerResult _end_of_whois_handler(IdleParser *parser, IdlePar
 static IdleParserHandlerResult _no_such_server_handler(IdleParser *parser, IdleParserMessageCode code, GValueArray *args, gpointer user_data) {
 	IdleConnection *conn = IDLE_CONNECTION(user_data);
 	TpBaseConnection *base = TP_BASE_CONNECTION(conn);
-	TpHandleRepoIface *contact_handles = tp_base_connection_get_handles(base, TP_HANDLE_TYPE_CONTACT);
+	TpHandleRepoIface *contact_handles = tp_base_connection_get_handles(base, TP_ENTITY_TYPE_CONTACT);
 	TpHandle handle;
 	ContactInfoRequest *request;
 	GValueArray *norm_args = g_value_array_copy(args);
diff --git a/src/idle-handles.c b/src/idle-handles.c
index 0996ba6..9b72e43 100644
--- a/src/idle-handles.c
+++ b/src/idle-handles.c
@@ -163,14 +163,14 @@ static gchar *_channel_normalize_func(TpHandleRepoIface *repo, const gchar *id,
 void idle_handle_repos_init(TpHandleRepoIface **handles) {
 	g_assert(handles != NULL);
 
-	handles[TP_HANDLE_TYPE_CONTACT] = (TpHandleRepoIface *) g_object_new(TP_TYPE_DYNAMIC_HANDLE_REPO,
-			"handle-type", TP_HANDLE_TYPE_CONTACT,
+	handles[TP_ENTITY_TYPE_CONTACT] = (TpHandleRepoIface *) g_object_new(TP_TYPE_DYNAMIC_HANDLE_REPO,
+			"handle-type", TP_ENTITY_TYPE_CONTACT,
 			"normalize-function", _nick_normalize_func,
 			"default-normalize-context", NULL,
 			NULL);
 
-	handles[TP_HANDLE_TYPE_ROOM] = (TpHandleRepoIface *) g_object_new(TP_TYPE_DYNAMIC_HANDLE_REPO,
-			"handle-type", TP_HANDLE_TYPE_ROOM,
+	handles[TP_ENTITY_TYPE_ROOM] = (TpHandleRepoIface *) g_object_new(TP_TYPE_DYNAMIC_HANDLE_REPO,
+			"handle-type", TP_ENTITY_TYPE_ROOM,
 			"normalize-function", _channel_normalize_func,
 			"default-normalize-context", NULL,
 			NULL);
diff --git a/src/idle-im-channel.c b/src/idle-im-channel.c
index 76c7f4b..c8bd752 100644
--- a/src/idle-im-channel.c
+++ b/src/idle-im-channel.c
@@ -115,7 +115,7 @@ idle_im_channel_class_init (IdleIMChannelClass *idle_im_channel_class)
   object_class->finalize = idle_im_channel_finalize;
 
   base_class->channel_type = TP_IFACE_CHANNEL_TYPE_TEXT;
-  base_class->target_handle_type = TP_HANDLE_TYPE_CONTACT;
+  base_class->target_entity_type = TP_ENTITY_TYPE_CONTACT;
   base_class->close = idle_im_channel_close;
   base_class->fill_immutable_properties = idle_im_channel_fill_properties;
   base_class->get_object_path_suffix = idle_im_channel_get_path_suffix;
@@ -194,7 +194,7 @@ idle_im_channel_send (
   TpBaseChannel *base = TP_BASE_CHANNEL (obj);
   TpBaseConnection *conn = tp_base_channel_get_connection (base);
   const gchar *recipient = tp_handle_inspect (
-      tp_base_connection_get_handles (conn, TP_HANDLE_TYPE_CONTACT),
+      tp_base_connection_get_handles (conn, TP_ENTITY_TYPE_CONTACT),
       tp_base_channel_get_target_handle (base));
 
   idle_text_send (obj, message, flags, recipient, IDLE_CONNECTION (conn));
diff --git a/src/idle-im-manager.c b/src/idle-im-manager.c
index cd100fc..45d1744 100644
--- a/src/idle-im-manager.c
+++ b/src/idle-im-manager.c
@@ -48,7 +48,7 @@ enum {
 
 static const gchar * const im_channel_fixed_properties[] = {
     TP_IFACE_CHANNEL ".ChannelType",
-    TP_IFACE_CHANNEL ".TargetHandleType",
+    TP_IFACE_CHANNEL ".TargetEntityType",
     NULL
 };
 
@@ -76,7 +76,7 @@ static void connection_status_changed_cb (IdleConnection* conn, guint status, gu
 static void _im_manager_foreach(TpChannelManager *manager, TpExportableChannelFunc func, gpointer user_data);
 static void _im_manager_type_foreach_class (GType type, TpChannelManagerTypeChannelClassFunc func, gpointer user_data);
 
-//static TpChannelManagerRequestStatus _iface_request(TpChannelFactoryIface *iface, const gchar *chan_type, TpHandleType handle_type, guint handle, gpointer request, TpChannelIface **new_chan, GError **error);
+//static TpChannelManagerRequestStatus _iface_request(TpChannelFactoryIface *iface, const gchar *chan_type, TpEntityType handle_type, guint handle, gpointer request, TpChannelIface **new_chan, GError **error);
 
 static gboolean _im_manager_create_channel(TpChannelManager *manager, TpChannelManagerRequest *request, GHashTable *request_properties);
 static gboolean _im_manager_ensure_channel(TpChannelManager *manager, TpChannelManagerRequest *request, GHashTable *request_properties);
@@ -264,7 +264,7 @@ static void _im_manager_type_foreach_class (GType type,
 	g_hash_table_insert (table, (gpointer) im_channel_fixed_properties[0], value);
 
 	value = tp_g_value_slice_new (G_TYPE_UINT);
-	g_value_set_uint (value, TP_HANDLE_TYPE_CONTACT);
+	g_value_set_uint (value, TP_ENTITY_TYPE_CONTACT);
 	g_hash_table_insert (table, (gpointer) im_channel_fixed_properties[1], value);
 
 	func (type, table, im_channel_allowed_properties, user_data);
@@ -305,7 +305,7 @@ _im_manager_requestotron (IdleIMManager *self,
 	IdleIMManagerPrivate *priv = IDLE_IM_MANAGER_GET_PRIVATE (self);
 	TpBaseConnection *base_conn = (TpBaseConnection *) 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);
 	TpHandle handle;
 	GError *error = NULL;
 	TpExportableChannel *channel;
@@ -315,7 +315,7 @@ _im_manager_requestotron (IdleIMManager *self,
 		return FALSE;
 
 	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;
 
 	handle = tp_asv_get_uint32 (request_properties,
@@ -406,7 +406,7 @@ _im_manager_new_channel (IdleIMManager *mgr,
 	IdleIMManagerPrivate *priv = IDLE_IM_MANAGER_GET_PRIVATE (mgr);
 	TpBaseConnection *base_connection = TP_BASE_CONNECTION (priv->conn);
 	TpHandleRepoIface *handle_repo =
-		tp_base_connection_get_handles (base_connection, TP_HANDLE_TYPE_CONTACT);
+		tp_base_connection_get_handles (base_connection, TP_ENTITY_TYPE_CONTACT);
 	IdleIMChannel *chan;
 	const gchar *name;
 	GSList *requests = NULL;
diff --git a/src/idle-muc-channel.c b/src/idle-muc-channel.c
index fe9439c..e96d4f8 100644
--- a/src/idle-muc-channel.c
+++ b/src/idle-muc-channel.c
@@ -219,8 +219,8 @@ idle_muc_channel_constructed (GObject *obj)
 	TpBaseChannel *base = TP_BASE_CHANNEL (obj);
 	IdleMUCChannelPrivate *priv = self->priv;
 	TpBaseConnection *conn = tp_base_channel_get_connection (base);
-	TpHandleRepoIface *room_handles = tp_base_connection_get_handles(conn, TP_HANDLE_TYPE_ROOM);
-	TpHandleRepoIface *contact_handles = tp_base_connection_get_handles(conn, TP_HANDLE_TYPE_CONTACT);
+	TpHandleRepoIface *room_handles = tp_base_connection_get_handles(conn, TP_ENTITY_TYPE_ROOM);
+	TpHandleRepoIface *contact_handles = tp_base_connection_get_handles(conn, TP_ENTITY_TYPE_CONTACT);
 	TpChannelTextMessageType types[] = {
 			TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL,
 			TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION,
@@ -370,7 +370,7 @@ static void idle_muc_channel_class_init (IdleMUCChannelClass *idle_muc_channel_c
 	object_class->finalize = idle_muc_channel_finalize;
 
 	base_channel_class->channel_type = TP_IFACE_CHANNEL_TYPE_TEXT;
-	base_channel_class->target_handle_type = TP_HANDLE_TYPE_ROOM;
+	base_channel_class->target_entity_type = TP_ENTITY_TYPE_ROOM;
 
 	base_channel_class->close = idle_muc_channel_close;
 	base_channel_class->fill_immutable_properties = idle_muc_channel_fill_immutable_properties;
@@ -837,7 +837,7 @@ void idle_muc_channel_namereply(IdleMUCChannel *chan, GValueArray *args) {
 	TpBaseConnection *base_conn = tp_base_channel_get_connection (base);
 
 	if (!priv->namereply_set)
-		priv->namereply_set = tp_handle_set_new(tp_base_connection_get_handles(base_conn, TP_HANDLE_TYPE_CONTACT));
+		priv->namereply_set = tp_handle_set_new(tp_base_connection_get_handles(base_conn, TP_ENTITY_TYPE_CONTACT));
 
 	for (guint i = 1; (i + 1) < args->n_values; i += 2) {
 		TpHandle handle = g_value_get_uint(g_value_array_get_nth(args, i));
@@ -907,7 +907,7 @@ void idle_muc_channel_mode(IdleMUCChannel *chan, GValueArray *args) {
 	IdleMUCChannelPrivate *priv = chan->priv;
 	TpBaseChannel *base = TP_BASE_CHANNEL (chan);
 	TpBaseConnection *base_conn = tp_base_channel_get_connection (base);
-	TpHandleRepoIface *handles = tp_base_connection_get_handles(base_conn, TP_HANDLE_TYPE_CONTACT);
+	TpHandleRepoIface *handles = tp_base_connection_get_handles(base_conn, TP_ENTITY_TYPE_CONTACT);
 
         tp_base_room_config_set_retrieved (priv->room_config);
 
@@ -1077,7 +1077,7 @@ idle_muc_channel_topic_full (
   TpBaseChannel *base = TP_BASE_CHANNEL (self);
   TpBaseConnection *base_conn = tp_base_channel_get_connection (base);
   TpHandleRepoIface *handles = tp_base_connection_get_handles (base_conn,
-      TP_HANDLE_TYPE_CONTACT);
+      TP_ENTITY_TYPE_CONTACT);
   guint i = 0;
   static const gchar *changed[] = { NULL, NULL, NULL, NULL, NULL };
 
@@ -1201,7 +1201,7 @@ static gboolean send_invite_request(IdleMUCChannel *obj, TpHandle handle, GError
 
 	priv = obj->priv;
 
-	nick = tp_handle_inspect(tp_base_connection_get_handles(base_conn, TP_HANDLE_TYPE_CONTACT), handle);
+	nick = tp_handle_inspect(tp_base_connection_get_handles(base_conn, TP_ENTITY_TYPE_CONTACT), handle);
 
 	if ((nick == NULL) || (nick[0] == '\0')) {
 		IDLE_DEBUG("invalid handle %u passed", handle);
@@ -1229,7 +1229,7 @@ static gboolean send_kick_request(IdleMUCChannel *obj, TpHandle handle, const gc
 
 	priv = obj->priv;
 
-	nick = tp_handle_inspect(tp_base_connection_get_handles(base_conn, TP_HANDLE_TYPE_CONTACT), handle);
+	nick = tp_handle_inspect(tp_base_connection_get_handles(base_conn, TP_ENTITY_TYPE_CONTACT), handle);
 
 	if ((nick == NULL) || (nick[0] == '\0')) {
 		IDLE_DEBUG("invalid handle %u passed", handle);
diff --git a/src/idle-muc-manager.c b/src/idle-muc-manager.c
index 98aec2a..c3e490b 100644
--- a/src/idle-muc-manager.c
+++ b/src/idle-muc-manager.c
@@ -90,7 +90,7 @@ static void _channel_join_ready_cb(IdleMUCChannel *chan, guint err, gpointer use
 
 static const gchar * const muc_channel_fixed_properties[] = {
     TP_PROP_CHANNEL_CHANNEL_TYPE,
-    TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+    TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
     NULL
 };
 
@@ -101,7 +101,7 @@ static const gchar * const muc_channel_allowed_properties[] = {
 };
 
 static const gchar * const muc_channel_allowed_room_properties[] = {
-    TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, /* But it must be None */
+    TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, /* But it must be None */
     TP_PROP_CHANNEL_INTERFACE_ROOM1_ROOM_NAME,
     NULL
 };
@@ -626,7 +626,7 @@ _muc_manager_type_foreach_channel_class (
     {
       handle_fixed = tp_asv_new (
           TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
-          TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_ROOM,
+          TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_ROOM,
           NULL);
       room_name_fixed = tp_asv_new (
           TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_TEXT,
@@ -761,9 +761,9 @@ _muc_manager_request (
   IdleMUCManagerPrivate *priv = IDLE_MUC_MANAGER_GET_PRIVATE (self);
   TpBaseConnection *base_conn = (TpBaseConnection *) priv->conn;
   TpHandleRepoIface *room_repo = tp_base_connection_get_handles (base_conn,
-      TP_HANDLE_TYPE_ROOM);
+      TP_ENTITY_TYPE_ROOM);
   GError *error = NULL;
-  TpHandleType handle_type;
+  TpEntityType handle_type;
   TpHandle handle;
   const gchar *channel_type;
   IdleMUCChannel *channel;
@@ -775,11 +775,11 @@ _muc_manager_request (
     return FALSE;
 
   handle_type = tp_asv_get_uint32 (request_properties,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL);
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, NULL);
 
   switch (handle_type)
     {
-      case TP_HANDLE_TYPE_ROOM:
+      case TP_ENTITY_TYPE_ROOM:
         handle = tp_asv_get_uint32 (request_properties,
             TP_PROP_CHANNEL_TARGET_HANDLE, NULL);
 
@@ -788,7 +788,7 @@ _muc_manager_request (
 
         break;
 
-      case TP_HANDLE_TYPE_NONE:
+      case TP_ENTITY_TYPE_NONE:
       {
         const gchar *room_name = tp_asv_get_string (request_properties,
             TP_PROP_CHANNEL_INTERFACE_ROOM1_ROOM_NAME);
diff --git a/src/idle-parser.c b/src/idle-parser.c
index 6f0885c..9b3c97b 100644
--- a/src/idle-parser.c
+++ b/src/idle-parser.c
@@ -374,8 +374,8 @@ static void _parse_and_forward_one(IdleParser *parser, gchar **tokens, IdleParse
 	gboolean success = TRUE;
 	gchar **iter = tokens;
 	/* We keep a ref to each unique handle in a message so that we can unref them after calling all handlers */
-	TpHandleSet *contact_reffed = tp_handle_set_new(tp_base_connection_get_handles(TP_BASE_CONNECTION(priv->conn), TP_HANDLE_TYPE_CONTACT));
-	TpHandleSet *room_reffed = tp_handle_set_new(tp_base_connection_get_handles(TP_BASE_CONNECTION(priv->conn), TP_HANDLE_TYPE_ROOM));
+	TpHandleSet *contact_reffed = tp_handle_set_new(tp_base_connection_get_handles(TP_BASE_CONNECTION(priv->conn), TP_ENTITY_TYPE_CONTACT));
+	TpHandleSet *room_reffed = tp_handle_set_new(tp_base_connection_get_handles(TP_BASE_CONNECTION(priv->conn), TP_ENTITY_TYPE_ROOM));
 
 	IDLE_DEBUG("message code %u", code);
 
@@ -482,8 +482,8 @@ static gboolean _parse_atom(IdleParser *parser, GValueArray *arr, char atom, con
 	IdleParserPrivate *priv = IDLE_PARSER_GET_PRIVATE(parser);
 	TpHandle handle;
 	GValue val = {0};
-	TpHandleRepoIface *contact_repo = tp_base_connection_get_handles(TP_BASE_CONNECTION(priv->conn), TP_HANDLE_TYPE_CONTACT);
-	TpHandleRepoIface *room_repo = tp_base_connection_get_handles(TP_BASE_CONNECTION(priv->conn), TP_HANDLE_TYPE_ROOM);
+	TpHandleRepoIface *contact_repo = tp_base_connection_get_handles(TP_BASE_CONNECTION(priv->conn), TP_ENTITY_TYPE_CONTACT);
+	TpHandleRepoIface *room_repo = tp_base_connection_get_handles(TP_BASE_CONNECTION(priv->conn), TP_ENTITY_TYPE_ROOM);
 
 	if (token[0] == ':')
 		token++;
diff --git a/src/idle-roomlist-channel.c b/src/idle-roomlist-channel.c
index a07e7b4..03e26fc 100644
--- a/src/idle-roomlist-channel.c
+++ b/src/idle-roomlist-channel.c
@@ -92,7 +92,7 @@ idle_roomlist_channel_constructed (GObject *obj)
 
   priv->rooms = g_ptr_array_new ();
   priv->handles = tp_handle_set_new(tp_base_connection_get_handles (
-     TP_BASE_CONNECTION(priv->connection), TP_HANDLE_TYPE_ROOM));
+     TP_BASE_CONNECTION(priv->connection), TP_ENTITY_TYPE_ROOM));
 }
 
 static gchar *
@@ -149,7 +149,7 @@ idle_roomlist_channel_class_init (IdleRoomlistChannelClass *idle_roomlist_channe
   object_class->finalize = idle_roomlist_channel_finalize;
 
   base_channel_class->channel_type = TP_IFACE_CHANNEL_TYPE_ROOM_LIST1;
-  base_channel_class->target_handle_type = TP_HANDLE_TYPE_NONE;
+  base_channel_class->target_entity_type = TP_ENTITY_TYPE_NONE;
   base_channel_class->close = idle_roomlist_channel_close;
   base_channel_class->fill_immutable_properties = idle_roomlist_channel_fill_properties;
   base_channel_class->get_object_path_suffix = idle_roomlist_channel_get_path_suffix;
@@ -314,7 +314,7 @@ _rpl_list_handler (IdleParser *parser,
   TpHandle room_handle = g_value_get_uint (g_value_array_get_nth (args, 0));
   TpHandleRepoIface *handl_repo =
     tp_base_connection_get_handles(TP_BASE_CONNECTION(priv->connection),
-        TP_HANDLE_TYPE_ROOM);
+        TP_ENTITY_TYPE_ROOM);
   const gchar *room_name = tp_handle_inspect(handl_repo, room_handle);
   guint num_users = g_value_get_uint (g_value_array_get_nth (args, 1));
   /* topic is optional */
diff --git a/src/idle-roomlist-manager.c b/src/idle-roomlist-manager.c
index 29f9f2e..8a9f083 100644
--- a/src/idle-roomlist-manager.c
+++ b/src/idle-roomlist-manager.c
@@ -47,7 +47,7 @@ enum {
 
 static const gchar * const roomlist_channel_fixed_properties[] = {
     TP_IFACE_CHANNEL ".ChannelType",
-    TP_IFACE_CHANNEL ".TargetHandleType",
+    TP_IFACE_CHANNEL ".TargetEntityType",
     NULL
 };
 
@@ -242,7 +242,7 @@ _roomlist_manager_foreach_class (TpChannelManager *self,
       roomlist_channel_fixed_properties[0], G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_ROOM_LIST1,
       roomlist_channel_fixed_properties[1], G_TYPE_UINT,
-          TP_HANDLE_TYPE_NONE,
+          TP_ENTITY_TYPE_NONE,
       NULL);
 
   func (self, table, roomlist_channel_allowed_properties, user_data);
@@ -290,7 +290,7 @@ _roomlist_manager_requestotron (IdleRoomlistManager *self,
     return FALSE;
 
   if (tp_asv_get_uint32 (request_properties,
-        TP_IFACE_CHANNEL ".TargetHandleType", NULL) != 0)
+        TP_IFACE_CHANNEL ".TargetEntityType", NULL) != 0)
     return FALSE;
 
   /* Check if there are any other properties that we don't understand */
diff --git a/src/server-tls-channel.c b/src/server-tls-channel.c
index 9d710b1..dfd049c 100644
--- a/src/server-tls-channel.c
+++ b/src/server-tls-channel.c
@@ -254,7 +254,7 @@ idle_server_tls_channel_class_init (IdleServerTLSChannelClass *klass)
   oclass->constructed = idle_server_tls_channel_constructed;
 
   base_class->channel_type = TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION1;
-  base_class->target_handle_type = TP_HANDLE_TYPE_NONE;
+  base_class->target_entity_type = TP_ENTITY_TYPE_NONE;
   base_class->fill_immutable_properties =
       idle_server_tls_channel_fill_immutable_properties;
   base_class->get_object_path_suffix =
diff --git a/tests/twisted/channels/requests-muc.py b/tests/twisted/channels/requests-muc.py
index 19c9809..864c3f7 100644
--- a/tests/twisted/channels/requests-muc.py
+++ b/tests/twisted/channels/requests-muc.py
@@ -21,7 +21,7 @@ def build_request(conn, channel_name, use_room):
         'RequestableChannelClasses')
 
     if use_room:
-        # We allow TargetHandleType in Room-flavoured requests, but it has to
+        # We allow TargetEntityType in Room-flavoured requests, but it has to
         # be None if specified.
         assertContains(
             ({ cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_TEXT },
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'