TargetHandleType has been renamed to TargetEntityType

24 files changed, 37 insertions, 37 deletions

diff --git a/examples/client/approver.c b/examples/client/approver.c
index 080c4f94d..adf91bb44 100644
--- a/examples/client/approver.c
+++ b/examples/client/approver.c
@@ -145,7 +145,7 @@ main (int argc,
   tp_base_client_take_approver_filter (approver, 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_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           TP_ENTITY_TYPE_CONTACT,
         NULL));
 
@@ -153,7 +153,7 @@ main (int argc,
   tp_base_client_take_approver_filter (approver, tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_CALL,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           TP_ENTITY_TYPE_CONTACT,
         NULL));
   */
@@ -162,7 +162,7 @@ main (int argc,
   tp_base_client_take_approver_filter (approver, 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_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           TP_ENTITY_TYPE_ROOM,
         NULL));
 
@@ -170,7 +170,7 @@ main (int argc,
   tp_base_client_take_approver_filter (approver, tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           TP_ENTITY_TYPE_CONTACT,
         NULL));
 
diff --git a/examples/client/dbus-tubes/accepter.c b/examples/client/dbus-tubes/accepter.c
index a371b6db9..bbff74981 100644
--- a/examples/client/dbus-tubes/accepter.c
+++ b/examples/client/dbus-tubes/accepter.c
@@ -174,7 +174,7 @@ main (int argc,
       G_TYPE_STRING,
       TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1,
 
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
       G_TYPE_UINT,
       TP_ENTITY_TYPE_CONTACT,
 
diff --git a/examples/client/dbus-tubes/offerer.c b/examples/client/dbus-tubes/offerer.c
index f99712a36..edbc585ae 100644
--- a/examples/client/dbus-tubes/offerer.c
+++ b/examples/client/dbus-tubes/offerer.c
@@ -208,7 +208,7 @@ main (int argc,
       G_TYPE_STRING,
       TP_IFACE_CHANNEL_TYPE_DBUS_TUBE1,
 
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
       G_TYPE_UINT,
       TP_ENTITY_TYPE_CONTACT,
 
diff --git a/examples/client/media-observer.c b/examples/client/media-observer.c
index c6b6a4731..9e1ae38f2 100644
--- a/examples/client/media-observer.c
+++ b/examples/client/media-observer.c
@@ -75,7 +75,7 @@ main (int argc,
   tp_base_client_take_observer_filter (observer, tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_CALL,
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           TP_ENTITY_TYPE_CONTACT,
         NULL));
   */
diff --git a/examples/client/python/dialler.py b/examples/client/python/dialler.py
index 66dcce26c..f7144eef4 100755
--- a/examples/client/python/dialler.py
+++ b/examples/client/python/dialler.py
@@ -178,7 +178,7 @@ class Dialler(Gtk.Application):
                 {
                     Tp.PROP_CHANNEL_CHANNEL_TYPE:
                         Tp.IFACE_CHANNEL_TYPE_CALL,
-                    Tp.PROP_CHANNEL_TARGET_HANDLE_TYPE:
+                    Tp.PROP_CHANNEL_TARGET_ENTITY_TYPE:
                         int(Tp.HandleType.CONTACT),
                     Tp.PROP_CHANNEL_TARGET_ID: self.target_entry.get_text(),
                     Tp.PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO: True,
diff --git a/examples/client/python/ensure-channel.py b/examples/client/python/ensure-channel.py
index 310fff6a9..b38a136e7 100755
--- a/examples/client/python/ensure-channel.py
+++ b/examples/client/python/ensure-channel.py
@@ -21,14 +21,14 @@ def create_request_dict(action, contact_id):
         return {
             TelepathyGLib.PROP_CHANNEL_CHANNEL_TYPE:
                 TelepathyGLib.IFACE_CHANNEL_TYPE_TEXT,
-            TelepathyGLib.PROP_CHANNEL_TARGET_HANDLE_TYPE:
+            TelepathyGLib.PROP_CHANNEL_TARGET_ENTITY_TYPE:
                 int(TelepathyGLib.HandleType.CONTACT),
             TelepathyGLib.PROP_CHANNEL_TARGET_ID: contact_id}
     elif action in ['audio', 'video']:
         return {
             TelepathyGLib.PROP_CHANNEL_CHANNEL_TYPE:
                 TelepathyGLib.IFACE_CHANNEL_TYPE_STREAMED_MEDIA,
-            TelepathyGLib.PROP_CHANNEL_TARGET_HANDLE_TYPE:
+            TelepathyGLib.PROP_CHANNEL_TARGET_ENTITY_TYPE:
                 int(TelepathyGLib.HandleType.CONTACT),
             TelepathyGLib.PROP_CHANNEL_TARGET_ID: contact_id,
             TelepathyGLib.PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_AUDIO:
diff --git a/examples/client/python/file-transfer.py b/examples/client/python/file-transfer.py
index 6850d4599..55627693d 100755
--- a/examples/client/python/file-transfer.py
+++ b/examples/client/python/file-transfer.py
@@ -65,7 +65,7 @@ if __name__ == '__main__':
     request_dict = {
         TelepathyGLib.PROP_CHANNEL_CHANNEL_TYPE:
             TelepathyGLib.IFACE_CHANNEL_TYPE_FILE_TRANSFER,
-        TelepathyGLib.PROP_CHANNEL_TARGET_HANDLE_TYPE:
+        TelepathyGLib.PROP_CHANNEL_TARGET_ENTITY_TYPE:
             int(TelepathyGLib.HandleType.CONTACT),
         TelepathyGLib.PROP_CHANNEL_TARGET_ID:
             contact_id,
diff --git a/examples/client/python/ft-handler.py b/examples/client/python/ft-handler.py
index 3d457da4e..5f47ca427 100644
--- a/examples/client/python/ft-handler.py
+++ b/examples/client/python/ft-handler.py
@@ -56,7 +56,7 @@ if __name__ == '__main__':
     handler.add_handler_filter({
         TelepathyGLib.PROP_CHANNEL_CHANNEL_TYPE:
             TelepathyGLib.IFACE_CHANNEL_TYPE_FILE_TRANSFER,
-        TelepathyGLib.PROP_CHANNEL_TARGET_HANDLE_TYPE:
+        TelepathyGLib.PROP_CHANNEL_TARGET_ENTITY_TYPE:
             int(TelepathyGLib.HandleType.CONTACT),
         TelepathyGLib.PROP_CHANNEL_REQUESTED: False
         })
diff --git a/examples/client/python/stream-tube-accepter.py b/examples/client/python/stream-tube-accepter.py
index 2ab960ec9..8d0da1d48 100755
--- a/examples/client/python/stream-tube-accepter.py
+++ b/examples/client/python/stream-tube-accepter.py
@@ -65,7 +65,7 @@ if __name__ == '__main__':
 
     handler.add_handler_filter({
         Tp.PROP_CHANNEL_CHANNEL_TYPE: Tp.IFACE_CHANNEL_TYPE_STREAM_TUBE,
-        Tp.PROP_CHANNEL_TARGET_HANDLE_TYPE: int(Tp.HandleType.CONTACT),
+        Tp.PROP_CHANNEL_TARGET_ENTITY_TYPE: int(Tp.HandleType.CONTACT),
         Tp.PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE: "ExampleService",
     })
 
diff --git a/examples/client/python/stream-tube-offerer.py b/examples/client/python/stream-tube-offerer.py
index 65eb528c7..884ba74c7 100755
--- a/examples/client/python/stream-tube-offerer.py
+++ b/examples/client/python/stream-tube-offerer.py
@@ -90,7 +90,7 @@ if __name__ == '__main__':
     request_dict = {
         Tp.PROP_CHANNEL_CHANNEL_TYPE:
             Tp.IFACE_CHANNEL_TYPE_STREAM_TUBE,
-        Tp.PROP_CHANNEL_TARGET_HANDLE_TYPE:
+        Tp.PROP_CHANNEL_TARGET_ENTITY_TYPE:
             int(Tp.HandleType.CONTACT),
         Tp.PROP_CHANNEL_TARGET_ID:
             contact_id,
diff --git a/examples/client/python/text-handler.py b/examples/client/python/text-handler.py
index 6b1c0e3dd..4d6a9f8d1 100755
--- a/examples/client/python/text-handler.py
+++ b/examples/client/python/text-handler.py
@@ -61,7 +61,7 @@ if __name__ == '__main__':
     handler.add_handler_filter({
         TelepathyGLib.PROP_CHANNEL_CHANNEL_TYPE: TelepathyGLib.IFACE_CHANNEL_TYPE_TEXT,
         # bgo #637466
-        TelepathyGLib.PROP_CHANNEL_TARGET_HANDLE_TYPE: int(TelepathyGLib.HandleType.CONTACT),
+        TelepathyGLib.PROP_CHANNEL_TARGET_ENTITY_TYPE: int(TelepathyGLib.HandleType.CONTACT),
         TelepathyGLib.PROP_CHANNEL_REQUESTED: False,
     })
 
diff --git a/examples/client/stream-tubes/accepter.c b/examples/client/stream-tubes/accepter.c
index d8848696f..ca0649dd3 100644
--- a/examples/client/stream-tubes/accepter.c
+++ b/examples/client/stream-tubes/accepter.c
@@ -116,7 +116,7 @@ main (int argc,
         G_TYPE_STRING,
         TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
 
-        TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
         G_TYPE_UINT,
         TP_ENTITY_TYPE_CONTACT,
 
diff --git a/examples/client/stream-tubes/offerer.c b/examples/client/stream-tubes/offerer.c
index e3eb7bc6b..18b6de080 100644
--- a/examples/client/stream-tubes/offerer.c
+++ b/examples/client/stream-tubes/offerer.c
@@ -160,7 +160,7 @@ main (int argc,
       G_TYPE_STRING,
       TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
 
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
       G_TYPE_UINT,
       TP_ENTITY_TYPE_CONTACT,
 
diff --git a/examples/client/text-handler.c b/examples/client/text-handler.c
index 4e79f1c05..db722acd5 100644
--- a/examples/client/text-handler.c
+++ b/examples/client/text-handler.c
@@ -115,7 +115,7 @@ main (int argc,
   tp_base_client_take_handler_filter (handler, 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_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
           TP_ENTITY_TYPE_CONTACT,
         TP_PROP_CHANNEL_REQUESTED, G_TYPE_BOOLEAN, FALSE,
         NULL));
diff --git a/examples/cm/call/call-channel.c b/examples/cm/call/call-channel.c
index cb4bc76e1..2985a2f7b 100644
--- a/examples/cm/call/call-channel.c
+++ b/examples/cm/call/call-channel.c
@@ -338,7 +338,7 @@ example_call_channel_class_init (ExampleCallChannelClass *klass)
   call_class->add_content = call_add_content;
   call_class->hangup = call_hangup;
 
-  base_class->target_handle_type = TP_ENTITY_TYPE_CONTACT;
+  base_class->target_entity_type = TP_ENTITY_TYPE_CONTACT;
   base_class->get_interfaces = example_call_channel_get_interfaces;
   base_class->close = close_channel;
 
diff --git a/examples/cm/call/call-manager.c b/examples/cm/call/call-manager.c
index 4287e8114..fe7443344 100644
--- a/examples/cm/call/call-manager.c
+++ b/examples/cm/call/call-manager.c
@@ -358,14 +358,14 @@ new_channel (ExampleCallManager *self,
 
 static const gchar * const audio_fixed_properties[] = {
     TP_PROP_CHANNEL_CHANNEL_TYPE,
-    TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+    TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
     TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO,
     NULL
 };
 
 static const gchar * const video_fixed_properties[] = {
     TP_PROP_CHANNEL_CHANNEL_TYPE,
-    TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+    TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
     TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO,
     NULL
 };
@@ -392,7 +392,7 @@ example_call_manager_type_foreach_channel_class (GType type,
   GHashTable *table = tp_asv_new (
       TP_PROP_CHANNEL_CHANNEL_TYPE,
           G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_CALL1,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
     TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO, G_TYPE_BOOLEAN, TRUE,
       NULL);
 
@@ -425,7 +425,7 @@ example_call_manager_request (ExampleCallManager *self,
     }
 
   if (tp_asv_get_uint32 (request_properties,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL) != TP_ENTITY_TYPE_CONTACT)
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, NULL) != TP_ENTITY_TYPE_CONTACT)
     {
       return FALSE;
     }
diff --git a/examples/cm/call/example_call.manager b/examples/cm/call/example_call.manager
index a863e57be..1eb54c137 100644
--- a/examples/cm/call/example_call.manager
+++ b/examples/cm/call/example_call.manager
@@ -14,12 +14,12 @@ Icon=face-smile
 
 [audio]
 im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Call1
-im.telepathy.v1.Channel.TargetHandleType u=1
+im.telepathy.v1.Channel.TargetEntityType u=1
 im.telepathy.v1.Channel.Type.Call1.InitialAudio b=1
 allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;im.telepathy.v1.Channel.Type.Call1.InitialVideo;
 
 [video]
 im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Call1
-im.telepathy.v1.Channel.TargetHandleType u=1
+im.telepathy.v1.Channel.TargetEntityType u=1
 im.telepathy.v1.Channel.Type.Call1.InitialVideo b=1
 allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;im.telepathy.v1.Channel.Type.Call1.InitialAudio;
diff --git a/examples/cm/channelspecific/example_csh.manager b/examples/cm/channelspecific/example_csh.manager
index 8beed206c..6114bf208 100644
--- a/examples/cm/channelspecific/example_csh.manager
+++ b/examples/cm/channelspecific/example_csh.manager
@@ -14,5 +14,5 @@ Icon=face-smile
 
 [room]
 im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text
-im.telepathy.v1.Channel.TargetHandleType u=2
+im.telepathy.v1.Channel.TargetEntityType u=2
 allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;
diff --git a/examples/cm/channelspecific/room-manager.c b/examples/cm/channelspecific/room-manager.c
index acd5aa838..44f46f46c 100644
--- a/examples/cm/channelspecific/room-manager.c
+++ b/examples/cm/channelspecific/room-manager.c
@@ -261,7 +261,7 @@ new_channel (ExampleCSHRoomManager *self,
 
 static const gchar * const fixed_properties[] = {
     TP_PROP_CHANNEL_CHANNEL_TYPE,
-    TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+    TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
     NULL
 };
 
@@ -279,7 +279,7 @@ example_csh_room_manager_type_foreach_channel_class (GType type,
     GHashTable *table = 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_ENTITY_TYPE_ROOM,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_ROOM,
         NULL);
 
     func (type, table, allowed_properties, user_data);
@@ -305,7 +305,7 @@ example_csh_room_manager_request (ExampleCSHRoomManager *self,
     }
 
   if (tp_asv_get_uint32 (request_properties,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL) != TP_ENTITY_TYPE_ROOM)
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, NULL) != TP_ENTITY_TYPE_ROOM)
     {
       return FALSE;
     }
diff --git a/examples/cm/channelspecific/room.c b/examples/cm/channelspecific/room.c
index 07a81544f..f8a83ad0c 100644
--- a/examples/cm/channelspecific/room.c
+++ b/examples/cm/channelspecific/room.c
@@ -405,7 +405,7 @@ example_csh_room_channel_class_init (ExampleCSHRoomChannelClass *klass)
   object_class->finalize = finalize;
 
   base_class->channel_type = TP_IFACE_CHANNEL_TYPE_TEXT;
-  base_class->target_handle_type = TP_ENTITY_TYPE_ROOM;
+  base_class->target_entity_type = TP_ENTITY_TYPE_ROOM;
   base_class->get_interfaces = example_csh_room_channel_get_interfaces;
 
   base_class->close = example_csh_room_channel_close;
diff --git a/examples/cm/contactlist/example_contact_list.manager b/examples/cm/contactlist/example_contact_list.manager
index 238b4a994..a6fd78d04 100644
--- a/examples/cm/contactlist/example_contact_list.manager
+++ b/examples/cm/contactlist/example_contact_list.manager
@@ -14,10 +14,10 @@ Icon=face-smile
 
 [contactlist]
 im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.ContactList
-im.telepathy.v1.Channel.TargetHandleType u=3
+im.telepathy.v1.Channel.TargetEntityType u=3
 allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;
 
 [contactgroup]
 im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.ContactList
-im.telepathy.v1.Channel.TargetHandleType u=4
+im.telepathy.v1.Channel.TargetEntityType u=4
 allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;
diff --git a/examples/cm/echo-message-parts/chan.c b/examples/cm/echo-message-parts/chan.c
index 15dbef738..7d2a6fabf 100644
--- a/examples/cm/echo-message-parts/chan.c
+++ b/examples/cm/echo-message-parts/chan.c
@@ -332,7 +332,7 @@ example_echo_2_channel_class_init (ExampleEcho2ChannelClass *klass)
   object_class->finalize = finalize;
 
   base_class->channel_type = TP_IFACE_CHANNEL_TYPE_TEXT;
-  base_class->target_handle_type = TP_ENTITY_TYPE_CONTACT;
+  base_class->target_entity_type = TP_ENTITY_TYPE_CONTACT;
   base_class->get_interfaces = example_echo_2_channel_get_interfaces;
   base_class->close = example_echo_2_channel_close;
   base_class->fill_immutable_properties =
diff --git a/examples/cm/echo-message-parts/example_echo_2.manager b/examples/cm/echo-message-parts/example_echo_2.manager
index cd283cac0..b56a85d61 100644
--- a/examples/cm/echo-message-parts/example_echo_2.manager
+++ b/examples/cm/echo-message-parts/example_echo_2.manager
@@ -12,5 +12,5 @@ Icon=im-icq
 
 [1-1-text]
 im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text
-im.telepathy.v1.Channel.TargetHandleType u=1
+im.telepathy.v1.Channel.TargetEntityType u=1
 allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;
diff --git a/examples/cm/echo-message-parts/im-manager.c b/examples/cm/echo-message-parts/im-manager.c
index 236d143d5..a826aa418 100644
--- a/examples/cm/echo-message-parts/im-manager.c
+++ b/examples/cm/echo-message-parts/im-manager.c
@@ -257,7 +257,7 @@ new_channel (ExampleEcho2ImManager *self,
 
 static const gchar * const fixed_properties[] = {
     TP_PROP_CHANNEL_CHANNEL_TYPE,
-    TP_PROP_CHANNEL_TARGET_HANDLE_TYPE,
+    TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
     NULL
 };
 
@@ -275,7 +275,7 @@ example_echo_2_im_manager_type_foreach_channel_class (GType type,
   GHashTable *table = 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_ENTITY_TYPE_CONTACT,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
       NULL);
 
   func (type, table, allowed_properties, user_data);
@@ -301,7 +301,7 @@ example_echo_2_im_manager_request (ExampleEcho2ImManager *self,
     }
 
   if (tp_asv_get_uint32 (request_properties,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL) != TP_ENTITY_TYPE_CONTACT)
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, NULL) != TP_ENTITY_TYPE_CONTACT)
     {
       return FALSE;
     }