GNOME.org
 

[empathy/next] TpHandleType has been renamed to TpEntityType

commit 4d478bf8781d9b2e7c418ea245d7605cde2979b9
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Feb 13 12:36:56 2014 +0100

    TpHandleType has been renamed to TpEntityType

 data/Empathy.Auth.client                  |    2 +-
 data/Empathy.Call.client                  |    6 +++---
 data/Empathy.Chat.client                  |    6 +++---
 data/Empathy.FileTransfer.client          |    2 +-
 libempathy-gtk/empathy-call-utils.c       |    4 ++--
 libempathy-gtk/empathy-chat.c             |   20 ++++++++++----------
 libempathy-gtk/empathy-share-my-desktop.c |    4 ++--
 libempathy/empathy-auth-factory.c         |    4 ++--
 libempathy/empathy-chatroom-manager.c     |    4 ++--
 libempathy/empathy-contact.c              |    6 +++---
 libempathy/empathy-ft-factory.c           |    2 +-
 libempathy/empathy-ft-handler.c           |    8 ++++----
 libempathy/empathy-request-util.c         |   10 +++++-----
 libempathy/empathy-tp-chat.c              |    4 ++--
 src/empathy-call-factory.c                |   16 ++++++++--------
 src/empathy-call-observer.c               |    4 ++--
 src/empathy-chat-manager.c                |    6 +++---
 src/empathy-event-manager.c               |    8 ++++----
 18 files changed, 58 insertions(+), 58 deletions(-)
---
diff --git a/data/Empathy.Auth.client b/data/Empathy.Auth.client
index 018d802..9e8ad17 100644
--- a/data/Empathy.Auth.client
+++ b/data/Empathy.Auth.client
@@ -6,7 +6,7 @@ DelayApprovers=true
 
 [im.telepathy.v1.Client.Handler.HandlerChannelFilter 0]
 im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.ServerTLSConnection
-im.telepathy.v1.Channel.TargetHandleType u=0
+im.telepathy.v1.Channel.TargetEntityType u=0
 
 [im.telepathy.v1.Client.Handler.HandlerChannelFilter 1]
 im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.ServerAuthentication
diff --git a/data/Empathy.Call.client b/data/Empathy.Call.client
index 49bd7f8..b532aef 100644
--- a/data/Empathy.Call.client
+++ b/data/Empathy.Call.client
@@ -3,16 +3,16 @@ Interfaces=im.telepathy.v1.Client.Handler
 
 [im.telepathy.v1.Client.Handler.HandlerChannelFilter 0]
 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.Client.Handler.HandlerChannelFilter 1]
 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=true
 
 [im.telepathy.v1.Client.Handler.HandlerChannelFilter 2]
 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=true
 
 [im.telepathy.v1.Client.Handler.Capabilities]
diff --git a/data/Empathy.Chat.client b/data/Empathy.Chat.client
index 0ef4410..7f53f27 100644
--- a/data/Empathy.Chat.client
+++ b/data/Empathy.Chat.client
@@ -3,12 +3,12 @@ Interfaces=im.telepathy.v1.Client.Handler
 
 [im.telepathy.v1.Client.Handler.HandlerChannelFilter 0]
 im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text
-im.telepathy.v1.Channel.TargetHandleType u=0
+im.telepathy.v1.Channel.TargetEntityType u=0
 
 [im.telepathy.v1.Client.Handler.HandlerChannelFilter 1]
 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
 
 [im.telepathy.v1.Client.Handler.HandlerChannelFilter 2]
 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
diff --git a/data/Empathy.FileTransfer.client b/data/Empathy.FileTransfer.client
index 283aec9..9a8af5d 100644
--- a/data/Empathy.FileTransfer.client
+++ b/data/Empathy.FileTransfer.client
@@ -3,5 +3,5 @@ Interfaces=im.telepathy.v1.Client.Handler
 
 [im.telepathy.v1.Client.Handler.HandlerChannelFilter 0]
 im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.FileTransfer
-im.telepathy.v1.Channel.TargetHandleType u=1
+im.telepathy.v1.Channel.TargetEntityType u=1
 im.telepathy.v1.Channel.Requested b=false
diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c
index 4cb3bfe..47dec88 100644
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@ -79,8 +79,8 @@ empathy_call_create_call_request (const gchar *contact,
   GHashTable *asv = 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_HANDLE_TYPE_CONTACT,
+    TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
+      TP_ENTITY_TYPE_CONTACT,
     TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING,
       contact,
     NULL);
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 90907fb..6746d97 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -91,7 +91,7 @@ struct _EmpathyChatPriv {
        GCompletion       *completion;
        guint              composing_stop_timeout_id;
        guint              block_events_timeout_id;
-       TpHandleType       handle_type;
+       TpEntityType       handle_type;
        gint               contacts_width;
        gboolean           has_input_vscroll;
 
@@ -285,7 +285,7 @@ account_reconnected (EmpathyChat *chat,
        * report the error if any but this is blocked by
        * https://bugs.freedesktop.org/show_bug.cgi?id=13422 */
        switch (priv->handle_type) {
-               case TP_HANDLE_TYPE_CONTACT:
+               case TP_ENTITY_TYPE_CONTACT:
                        if (priv->sms_channel)
                                empathy_sms_contact_id (
                                        account, priv->id,
@@ -297,11 +297,11 @@ account_reconnected (EmpathyChat *chat,
                                        TP_USER_ACTION_TIME_NOT_USER_ACTION,
                                        NULL, NULL);
                        break;
-               case TP_HANDLE_TYPE_ROOM:
+               case TP_ENTITY_TYPE_ROOM:
                        empathy_join_muc (account, priv->id,
                                TP_USER_ACTION_TIME_NOT_USER_ACTION);
                        break;
-               case TP_HANDLE_TYPE_NONE:
+               case TP_ENTITY_TYPE_NONE:
                default:
                        g_assert_not_reached ();
                        break;
@@ -325,7 +325,7 @@ chat_new_connection_cb (TpAccount   *account,
                return;
 
        if (priv->tp_chat != NULL || account != priv->account ||
-           priv->handle_type == TP_HANDLE_TYPE_NONE ||
+           priv->handle_type == TP_ENTITY_TYPE_NONE ||
            TPAW_STR_EMPTY (priv->id))
                return;
 
@@ -848,7 +848,7 @@ chat_command_msg_internal (EmpathyChat *chat,
 
        request = 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_CONTACT,
+               TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
                TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, contact_id,
                NULL);
 
@@ -3061,7 +3061,7 @@ chat_remote_contact_changed_cb (EmpathyChat *chat)
        priv->remote_contact = empathy_tp_chat_get_remote_contact (priv->tp_chat);
        if (priv->remote_contact != NULL) {
                g_object_ref (priv->remote_contact);
-               priv->handle_type = TP_HANDLE_TYPE_CONTACT;
+               priv->handle_type = TP_ENTITY_TYPE_CONTACT;
        }
        else if (priv->tp_chat != NULL) {
                tp_channel_get_handle ((TpChannel *) priv->tp_chat, &priv->handle_type);
@@ -3457,7 +3457,7 @@ chat_constructed (GObject *object)
        }
 
        /* Add messages from last conversation */
-       if (priv->handle_type == TP_HANDLE_TYPE_ROOM)
+       if (priv->handle_type == TP_ENTITY_TYPE_ROOM)
                target = tpl_entity_new_from_room_id (priv->id);
        else
                target = tpl_entity_new (priv->id, TPL_ENTITY_CONTACT, NULL, NULL);
@@ -3466,7 +3466,7 @@ chat_constructed (GObject *object)
                                                                 TPL_EVENT_MASK_TEXT, chat_log_filter, chat);
        g_object_unref (target);
 
-       if (priv->handle_type != TP_HANDLE_TYPE_ROOM) {
+       if (priv->handle_type != TP_ENTITY_TYPE_ROOM) {
                /* First display logs from the logger and then display pending messages */
                chat_add_logs (chat);
        }
@@ -4470,7 +4470,7 @@ empathy_chat_is_room (EmpathyChat *chat)
 
        g_return_val_if_fail (EMPATHY_IS_CHAT (chat), FALSE);
 
-       return (priv->handle_type == TP_HANDLE_TYPE_ROOM);
+       return (priv->handle_type == TP_ENTITY_TYPE_ROOM);
 }
 
 gboolean
diff --git a/libempathy-gtk/empathy-share-my-desktop.c b/libempathy-gtk/empathy-share-my-desktop.c
index dc0ea77..3be92a9 100644
--- a/libempathy-gtk/empathy-share-my-desktop.c
+++ b/libempathy-gtk/empathy-share-my-desktop.c
@@ -61,8 +61,8 @@ empathy_share_my_desktop_share_with_contact (EmpathyContact *contact)
   request = tp_asv_new (
       TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
         TP_IFACE_CHANNEL_TYPE_STREAM_TUBE1,
-      TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
-        TP_HANDLE_TYPE_CONTACT,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
+        TP_ENTITY_TYPE_CONTACT,
       TP_PROP_CHANNEL_TARGET_HANDLE, G_TYPE_UINT,
         tp_contact_get_handle (tp_contact),
       TP_PROP_CHANNEL_TYPE_STREAM_TUBE1_SERVICE, G_TYPE_STRING, "rfb",
diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c
index 91d4fab..ecaff1f 100644
--- a/libempathy/empathy-auth-factory.c
+++ b/libempathy/empathy-auth-factory.c
@@ -637,8 +637,8 @@ empathy_auth_factory_constructed (GObject *obj)
           TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TP_IFACE_CHANNEL_TYPE_SERVER_TLS_CONNECTION1,
           /* AuthenticationMethod */
-          TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
-          TP_HANDLE_TYPE_NONE, NULL));
+          TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
+          TP_ENTITY_TYPE_NONE, NULL));
 
   tp_base_client_take_handler_filter (client, tp_asv_new (
           /* ChannelType */
diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index 78e5a04..adcaaca 100644
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -591,8 +591,8 @@ empathy_chatroom_manager_constructor (GType type,
   tp_base_client_take_observer_filter (priv->observer, 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));
 
   if (!tp_base_client_register (priv->observer, &error))
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index e543820..b6a7245 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -1696,16 +1696,16 @@ tp_caps_to_capabilities (TpCapabilities *caps)
   if (tp_capabilities_supports_file_transfer (caps))
     capabilities |= EMPATHY_CAPABILITIES_FT;
 
-  if (tp_capabilities_supports_stream_tubes (caps, TP_HANDLE_TYPE_CONTACT,
+  if (tp_capabilities_supports_stream_tubes (caps, TP_ENTITY_TYPE_CONTACT,
         "rfb"))
     capabilities |= EMPATHY_CAPABILITIES_RFB_STREAM_TUBE;
 
-  if (tp_capabilities_supports_audio_video_call (caps, TP_HANDLE_TYPE_CONTACT))
+  if (tp_capabilities_supports_audio_video_call (caps, TP_ENTITY_TYPE_CONTACT))
     {
       capabilities |= EMPATHY_CAPABILITIES_AUDIO;
       capabilities |= EMPATHY_CAPABILITIES_VIDEO;
     }
-  else if (tp_capabilities_supports_audio_call (caps, TP_HANDLE_TYPE_CONTACT))
+  else if (tp_capabilities_supports_audio_call (caps, TP_ENTITY_TYPE_CONTACT))
     {
       capabilities |= EMPATHY_CAPABILITIES_AUDIO;
     }
diff --git a/libempathy/empathy-ft-factory.c b/libempathy/empathy-ft-factory.c
index 0f5a0b5..003a50c 100644
--- a/libempathy/empathy-ft-factory.c
+++ b/libempathy/empathy-ft-factory.c
@@ -197,7 +197,7 @@ empathy_ft_factory_init (EmpathyFTFactory *self)
   tp_base_client_take_handler_filter (priv->handler, 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_HANDLE_TYPE_CONTACT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
         /* Only handle *incoming* channels as outgoing FT channels has to be
          * handled by the requester. */
         TP_PROP_CHANNEL_REQUESTED, G_TYPE_BOOLEAN, FALSE,
diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c
index bf3d6c8..a64f557 100644
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@ -862,8 +862,8 @@ ft_handler_populate_outgoing_request (EmpathyFTHandler *handler)
   priv->request = 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_HANDLE_TYPE_CONTACT,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
+        TP_ENTITY_TYPE_CONTACT,
       TP_PROP_CHANNEL_TARGET_HANDLE, G_TYPE_UINT,
         contact_handle,
       TP_PROP_CHANNEL_TYPE_FILE_TRANSFER1_CONTENT_TYPE, G_TYPE_STRING,
@@ -1115,8 +1115,8 @@ set_content_hash_type_from_classes (EmpathyFTHandler *handler,
       if (tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER1))
         continue;
 
-      if (tp_asv_get_uint32 (fixed, TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, NULL) !=
-          TP_HANDLE_TYPE_CONTACT)
+      if (tp_asv_get_uint32 (fixed, TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, NULL) !=
+          TP_ENTITY_TYPE_CONTACT)
         continue;
 
       support_ft = TRUE;
diff --git a/libempathy/empathy-request-util.c b/libempathy/empathy-request-util.c
index 89820d6..da77010 100644
--- a/libempathy/empathy-request-util.c
+++ b/libempathy/empathy-request-util.c
@@ -53,7 +53,7 @@ ensure_text_channel_cb (GObject *source,
 
 static void
 create_text_channel (TpAccount *account,
-    TpHandleType target_handle_type,
+    TpEntityType target_entity_type,
     const gchar *target_id,
     gboolean sms_channel,
     gint64 timestamp,
@@ -66,7 +66,7 @@ create_text_channel (TpAccount *account,
   request = 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, target_handle_type,
+      TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, target_entity_type,
       TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, target_id,
       NULL);
 
@@ -94,7 +94,7 @@ empathy_chat_with_contact_id (TpAccount *account,
     GAsyncReadyCallback callback,
     gpointer user_data)
 {
-  create_text_channel (account, TP_HANDLE_TYPE_CONTACT,
+  create_text_channel (account, TP_ENTITY_TYPE_CONTACT,
       contact_id, FALSE, timestamp, callback, user_data);
 }
 
@@ -103,7 +103,7 @@ empathy_join_muc (TpAccount *account,
     const gchar *room_name,
     gint64 timestamp)
 {
-  create_text_channel (account, TP_HANDLE_TYPE_ROOM,
+  create_text_channel (account, TP_ENTITY_TYPE_ROOM,
       room_name, FALSE, timestamp, NULL, NULL);
 }
 
@@ -116,6 +116,6 @@ empathy_sms_contact_id (TpAccount *account,
     GAsyncReadyCallback callback,
     gpointer user_data)
 {
-  create_text_channel (account, TP_HANDLE_TYPE_CONTACT,
+  create_text_channel (account, TP_ENTITY_TYPE_CONTACT,
       contact_id, TRUE, timestamp, callback, user_data);
 }
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index a631bcf..70f0925 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -208,8 +208,8 @@ empathy_tp_chat_add (EmpathyTpChat *self,
       props = 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_NONE,
+          TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
+              TP_ENTITY_TYPE_NONE,
           TP_PROP_CHANNEL_INTERFACE_CONFERENCE1_INITIAL_CHANNELS,
               TP_ARRAY_TYPE_OBJECT_PATH_LIST, &channels,
           TP_PROP_CHANNEL_INTERFACE_CONFERENCE1_INITIAL_INVITEE_IDS,
diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index e62e63f..36432d2 100644
--- a/src/empathy-call-factory.c
+++ b/src/empathy-call-factory.c
@@ -67,30 +67,30 @@ empathy_call_factory_init (EmpathyCallFactory *obj)
   tp_base_client_take_approver_filter (client, 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_HANDLE_TYPE_CONTACT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
+          G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
         NULL));
 
   tp_base_client_take_handler_filter (client, 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_HANDLE_TYPE_CONTACT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
+          G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
         NULL));
 
   tp_base_client_take_handler_filter (client, 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_HANDLE_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));
 
   tp_base_client_take_handler_filter (client, 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_HANDLE_TYPE_CONTACT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE,
+          G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
         TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO, G_TYPE_BOOLEAN, TRUE,
         NULL));
 
diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c
index 524b2a4..ef9d163 100644
--- a/src/empathy-call-observer.c
+++ b/src/empathy-call-observer.c
@@ -292,8 +292,8 @@ empathy_call_observer_init (EmpathyCallObserver *self)
       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_HANDLE_TYPE_CONTACT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT,
+          TP_ENTITY_TYPE_CONTACT,
         NULL));
 
   tp_base_client_set_observer_delay_approvers (self->priv->observer, TRUE);
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index 842fdc2..250cd1f 100644
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -281,17 +281,17 @@ empathy_chat_manager_init (EmpathyChatManager *self)
 
   tp_base_client_take_handler_filter (priv->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_HANDLE_TYPE_CONTACT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
         NULL));
 
   tp_base_client_take_handler_filter (priv->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_HANDLE_TYPE_ROOM,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_ROOM,
         NULL));
 
   tp_base_client_take_handler_filter (priv->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_HANDLE_TYPE_NONE,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_NONE,
         NULL));
 
   if (!tp_base_client_register (priv->handler, &error))
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 6de3c2a..68fed6b 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -1312,14 +1312,14 @@ empathy_event_manager_init (EmpathyEventManager *manager)
   tp_base_client_take_approver_filter (priv->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_HANDLE_TYPE_CONTACT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
         NULL));
 
   /* Muc text channels */
   tp_base_client_take_approver_filter (priv->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_HANDLE_TYPE_ROOM,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_ROOM,
         NULL));
 
   /* File transfer */
@@ -1327,7 +1327,7 @@ empathy_event_manager_init (EmpathyEventManager *manager)
       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_HANDLE_TYPE_CONTACT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
         NULL));
 
   /* Calls */
@@ -1335,7 +1335,7 @@ empathy_event_manager_init (EmpathyEventManager *manager)
       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_HANDLE_TYPE_CONTACT,
+        TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT,
         NULL));
 
   /* I don't feel good about doing this, and I'm sorry, but the
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]