TpHandleType has been renamed to TpEntityType

12 files changed, 29 insertions, 29 deletions

diff --git a/rakia/base-connection.c b/rakia/base-connection.c
index 58ae394..62069e6 100644
--- a/rakia/base-connection.c
+++ b/rakia/base-connection.c
@@ -221,7 +221,7 @@ rakia_base_connection_handle_to_uri (RakiaBaseConnection *self,
   GError *error = NULL;
 
   repo = tp_base_connection_get_handles (TP_BASE_CONNECTION (self),
-      TP_HANDLE_TYPE_CONTACT);
+      TP_ENTITY_TYPE_CONTACT);
 
   if (!tp_handle_is_valid (repo, handle, &error))
     {
diff --git a/rakia/call-channel.c b/rakia/call-channel.c
index 2c70ccf..062aa40 100644
--- a/rakia/call-channel.c
+++ b/rakia/call-channel.c
@@ -157,7 +157,7 @@ rakia_call_channel_class_init (
   object_class->finalize = rakia_call_channel_finalize;
 
 
-  base_channel_class->target_handle_type = TP_HANDLE_TYPE_CONTACT;
+  base_channel_class->target_entity_type = TP_ENTITY_TYPE_CONTACT;
   base_channel_class->get_object_path_suffix =
       rakia_call_channel_get_object_path_suffix;
   base_channel_class->close = rakia_call_channel_close;
diff --git a/rakia/connection-aliasing.c b/rakia/connection-aliasing.c
index 4e41c8c..2c35f73 100644
--- a/rakia/connection-aliasing.c
+++ b/rakia/connection-aliasing.c
@@ -156,7 +156,7 @@ rakia_connection_request_aliases (TpSvcConnectionInterfaceAliasing1 *iface,
   TP_BASE_CONNECTION_ERROR_IF_NOT_CONNECTED (base, context);
 
   contact_handles = tp_base_connection_get_handles (base,
-      TP_HANDLE_TYPE_CONTACT);
+      TP_ENTITY_TYPE_CONTACT);
 
   if (!tp_handles_are_valid (contact_handles, contacts, FALSE, &error))
     {
@@ -257,7 +257,7 @@ rakia_connection_set_aliases (TpSvcConnectionInterfaceAliasing1 *iface,
   alias = collapse_whitespace (alias, &to_free);
 
   contact_handles = tp_base_connection_get_handles (base,
-      TP_HANDLE_TYPE_CONTACT);
+      TP_ENTITY_TYPE_CONTACT);
   default_alias = conn_get_default_alias (base,
       contact_handles, self_handle);
 
@@ -292,7 +292,7 @@ rakia_conn_aliasing_fill_contact_attributes (TpBaseConnection *base,
       GValue *val;
 
       contact_handles = tp_base_connection_get_handles (base,
-          TP_HANDLE_TYPE_CONTACT);
+          TP_ENTITY_TYPE_CONTACT);
 
       val = tp_g_value_slice_new (G_TYPE_STRING);
 
diff --git a/rakia/handles.c b/rakia/handles.c
index 1295ca7..93f396a 100644
--- a/rakia/handles.c
+++ b/rakia/handles.c
@@ -40,7 +40,7 @@ rakia_handle_ensure (TpBaseConnection *conn,
   g_return_val_if_fail (TP_IS_BASE_CONNECTION (conn), 0);
   g_return_val_if_fail (uri != NULL, 0);
 
-  repo = tp_base_connection_get_handles (conn, TP_HANDLE_TYPE_CONTACT);
+  repo = tp_base_connection_get_handles (conn, TP_ENTITY_TYPE_CONTACT);
 
   str = url_as_string (NULL, uri);
 
@@ -86,7 +86,7 @@ rakia_handle_inspect (TpBaseConnection *conn,
   g_return_val_if_fail (TP_IS_BASE_CONNECTION (conn), NULL);
   g_return_val_if_fail (handle != 0, NULL);
 
-  repo = tp_base_connection_get_handles (conn, TP_HANDLE_TYPE_CONTACT);
+  repo = tp_base_connection_get_handles (conn, TP_ENTITY_TYPE_CONTACT);
 
   return tp_handle_inspect (repo, handle);
 }
diff --git a/rakia/media-manager.c b/rakia/media-manager.c
index c5ac45d..824d815 100644
--- a/rakia/media-manager.c
+++ b/rakia/media-manager.c
@@ -507,7 +507,7 @@ rakia_media_manager_foreach_channel (TpChannelManager *manager,
 
 static const gchar * const media_channel_fixed_properties[] = {
     TP_PROP_CHANNEL_CHANNEL_TYPE,
-    TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+    TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
     NULL
 };
 
@@ -544,10 +544,10 @@ rakia_media_manager_type_foreach_channel_class (GType type,
 
   handle_type_value = tp_g_value_slice_new (G_TYPE_UINT);
   /* no uint value yet - we'll change it for each channel class */
-  g_hash_table_insert (table, TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+  g_hash_table_insert (table, TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
       handle_type_value);
 
-  g_value_set_uint (handle_type_value, TP_HANDLE_TYPE_CONTACT);
+  g_value_set_uint (handle_type_value, TP_ENTITY_TYPE_CONTACT);
 
   g_hash_table_insert (table, TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO,
       tp_g_value_slice_new_boolean (TRUE));
@@ -580,7 +580,7 @@ rakia_media_manager_requestotron (TpChannelManager *manager,
   RakiaMediaManager *self = RAKIA_MEDIA_MANAGER (manager);
   RakiaMediaManagerPrivate *priv = RAKIA_MEDIA_MANAGER_GET_PRIVATE (self);
   TpBaseConnection *conn = (TpBaseConnection *) priv->conn;
-  TpHandleType handle_type;
+  TpEntityType handle_type;
   TpHandle handle;
   RakiaSipSession *session;
   RakiaCallChannel *channel = NULL;
@@ -622,12 +622,12 @@ rakia_media_manager_requestotron (TpChannelManager *manager,
     return FALSE;
 
   handle_type = tp_asv_get_uint32 (request_properties,
-      TP_IFACE_CHANNEL ".TargetHandleType", NULL);
+      TP_IFACE_CHANNEL ".TargetEntityType", NULL);
 
   handle = tp_asv_get_uint32 (request_properties,
       TP_IFACE_CHANNEL ".TargetHandle", NULL);
 
-  if (handle_type != TP_HANDLE_TYPE_CONTACT)
+  if (handle_type != TP_ENTITY_TYPE_CONTACT)
     return FALSE;
 
   g_assert (handle != 0);
diff --git a/rakia/text-channel.c b/rakia/text-channel.c
index c9ec834..82079bd 100644
--- a/rakia/text-channel.c
+++ b/rakia/text-channel.c
@@ -225,7 +225,7 @@ rakia_text_channel_class_init(RakiaTextChannelClass *klass)
   static TpDBusPropertiesMixinPropImpl channel_props[] = {
       { "ChannelType", "channel-type", NULL },
       { "Interfaces", "interfaces", NULL },
-      { "TargetHandleType", "handle-type", NULL },
+      { "TargetEntityType", "handle-type", NULL },
       { "TargetHandle", "handle", NULL },
       { "TargetID", "target-id", NULL },
       { "InitiatorHandle", "initiator-handle", NULL },
@@ -255,7 +255,7 @@ rakia_text_channel_class_init(RakiaTextChannelClass *klass)
 
   base_class->channel_type = TP_IFACE_CHANNEL_TYPE_TEXT;
   base_class->get_interfaces = rakia_text_channel_get_interfaces;
-  base_class->target_handle_type = TP_HANDLE_TYPE_CONTACT;
+  base_class->target_entity_type = TP_ENTITY_TYPE_CONTACT;
   base_class->close = rakia_text_channel_close;
   base_class->fill_immutable_properties =
     rakia_text_channel_fill_immutable_properties;
diff --git a/rakia/text-manager.c b/rakia/text-manager.c
index ca52479..816f5bb 100644
--- a/rakia/text-manager.c
+++ b/rakia/text-manager.c
@@ -309,7 +309,7 @@ rakia_text_manager_new_channel (RakiaTextManager *fac,
 
 static const gchar * const text_channel_fixed_properties[] = {
     TP_IFACE_CHANNEL ".ChannelType",
-    TP_IFACE_CHANNEL ".TargetHandleType",
+    TP_IFACE_CHANNEL ".TargetEntityType",
     NULL
 };
 
@@ -334,7 +334,7 @@ rakia_text_manager_type_foreach_channel_class (GType type,
       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, (gchar *) text_channel_fixed_properties[1],
       value);
 
@@ -361,7 +361,7 @@ rakia_text_manager_requestotron (RakiaTextManager *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;
 
   /* validity already checked by TpBaseConnection */
diff --git a/src/sip-connection.c b/src/sip-connection.c
index 2db7b59..1843c27 100644
--- a/src/sip-connection.c
+++ b/src/sip-connection.c
@@ -132,11 +132,11 @@ priv_url_from_string_value (su_home_t *home, const GValue *value)
 
 static void
 rakia_create_handle_repos (TpBaseConnection *conn,
-                           TpHandleRepoIface *repos[TP_NUM_HANDLE_TYPES])
+                           TpHandleRepoIface *repos[TP_NUM_ENTITY_TYPES])
 {
-  repos[TP_HANDLE_TYPE_CONTACT] =
+  repos[TP_ENTITY_TYPE_CONTACT] =
       (TpHandleRepoIface *)g_object_new (TP_TYPE_DYNAMIC_HANDLE_REPO,
-          "handle-type", TP_HANDLE_TYPE_CONTACT,
+          "handle-type", TP_ENTITY_TYPE_CONTACT,
           "normalize-function", rakia_handle_normalize,
           "default-normalize-context", conn,
           NULL);
@@ -1064,7 +1064,7 @@ rakia_connection_start_connecting (TpBaseConnection *base,
   g_assert (root != NULL);
   g_return_val_if_fail (priv->address != NULL, FALSE);
 
-  contact_repo = tp_base_connection_get_handles (base, TP_HANDLE_TYPE_CONTACT);
+  contact_repo = tp_base_connection_get_handles (base, TP_ENTITY_TYPE_CONTACT);
   self_handle = tp_handle_ensure (contact_repo, priv->address,
       NULL, error);
   if (self_handle == 0)
diff --git a/src/write-mgr-file.c b/src/write-mgr-file.c
index e831ac2..5dac217 100644
--- a/src/write-mgr-file.c
+++ b/src/write-mgr-file.c
@@ -197,7 +197,7 @@ generate_group_name (GHashTable *props)
   gchar *chan_type_suffix;
   gchar *handle_type_name;
   guint handle_type = tp_asv_get_uint32 (props,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL);
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, NULL);
 
   g_assert (chan_type != NULL);
   chan_type_suffix = strrchr (chan_type, '.');
@@ -206,11 +206,11 @@ generate_group_name (GHashTable *props)
 
   switch (handle_type)
     {
-    case TP_HANDLE_TYPE_CONTACT:
+    case TP_ENTITY_TYPE_CONTACT:
       handle_type_name = "-1on1";
       break;
 
-    case TP_HANDLE_TYPE_ROOM:
+    case TP_ENTITY_TYPE_ROOM:
       handle_type_name = "-multi";
       break;
 
diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py
index 77905b9..ab5c263 100644
--- a/tests/twisted/constants.py
+++ b/tests/twisted/constants.py
@@ -62,7 +62,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/test-message.py b/tests/twisted/test-message.py
index b92eca6..82bda4d 100644
--- a/tests/twisted/test-message.py
+++ b/tests/twisted/test-message.py
@@ -33,8 +33,8 @@ def test_new_channel(q, bus, conn, target_uri, initiator_uri, requested):
     assert 'TargetHandle' in text_props, text_props
     assert text_props['TargetHandle'] == handle, \
             (text_props, handle)
-    assert 'TargetHandleType' in text_props, text_props
-    assert text_props['TargetHandleType'] == 1, text_props
+    assert 'TargetEntityType' in text_props, text_props
+    assert text_props['TargetEntityType'] == 1, text_props
     assert text_props['TargetID'] == target_uri, text_props
     assert text_props['InitiatorHandle'] == initiator_handle, \
             (text_props, initiator_handle)
diff --git a/tests/twisted/voip/calltest.py b/tests/twisted/voip/calltest.py
index 5a2bd85..dfedb9a 100644
--- a/tests/twisted/voip/calltest.py
+++ b/tests/twisted/voip/calltest.py
@@ -64,7 +64,7 @@ class CallTest:
 
     def check_channel_props(self, props, initial):
         assertEquals(cs.CHANNEL_TYPE_CALL, props[cs.CHANNEL_TYPE])
-        assertEquals(cs.HT_CONTACT, props[cs.CHANNEL + '.TargetHandleType'])
+        assertEquals(cs.HT_CONTACT, props[cs.CHANNEL + '.TargetEntityType'])
         assertEquals(self.remote_handle, props[cs.CHANNEL + '.TargetHandle'])
         if self.incoming:
             assertEquals(self.remote_handle,