From db78d1618b43a8246e9cea5986fb8d775c0609af Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 13 Feb 2014 11:50:59 +0100 Subject: TpHandleType has been renamed to TpEntityType --- mission-control-plugins/dispatch-operation.c | 4 ++-- mission-control-plugins/dispatch-operation.h | 2 +- src/mcd-channel.c | 6 +++--- src/mcd-channel.h | 2 +- src/mcd-dispatcher.c | 4 ++-- tests/twisted/account-manager/make-valid.py | 2 +- tests/twisted/account-manager/request-online.py | 2 +- tests/twisted/account-requests/cancel.py | 4 ++-- tests/twisted/account-requests/create-text.py | 4 ++-- tests/twisted/account-requests/delete-account-during-request.py | 4 ++-- tests/twisted/capabilities/contact-caps.py | 6 +++--- tests/twisted/constants.py | 2 +- tests/twisted/crash-recovery/crash-recovery.py | 2 +- tests/twisted/dispatcher/already-has-channel.py | 2 +- tests/twisted/dispatcher/approver-fails.py | 2 +- tests/twisted/dispatcher/bypass-approval.py | 4 ++-- tests/twisted/dispatcher/cancel.py | 4 ++-- tests/twisted/dispatcher/capture-bundle.py | 6 +++--- tests/twisted/dispatcher/connect-for-request.py | 2 +- tests/twisted/dispatcher/create-at-startup.py | 4 ++-- tests/twisted/dispatcher/create-delayed-by-mini-plugin.py | 4 ++-- tests/twisted/dispatcher/create-handler-fails.py | 4 ++-- tests/twisted/dispatcher/create-hints.py | 4 ++-- tests/twisted/dispatcher/create-no-preferred-handler.py | 4 ++-- tests/twisted/dispatcher/create-rejected-by-mini-plugin.py | 4 ++-- tests/twisted/dispatcher/create-text.py | 4 ++-- tests/twisted/dispatcher/created-behind-our-back.py | 2 +- tests/twisted/dispatcher/delay-approvers.py | 2 +- tests/twisted/dispatcher/delay-then-call-handle-with.py | 2 +- tests/twisted/dispatcher/delay-then-dont-call-approvers.py | 2 +- tests/twisted/dispatcher/dispatch-activatable.py | 2 +- tests/twisted/dispatcher/dispatch-before-connected.py | 2 +- tests/twisted/dispatcher/dispatch-delayed-by-mini-plugin.py | 2 +- tests/twisted/dispatcher/dispatch-rejected-by-mini-plugin.py | 2 +- tests/twisted/dispatcher/dispatch-text.py | 2 +- tests/twisted/dispatcher/ensure-and-redispatch.py | 6 +++--- tests/twisted/dispatcher/ensure-is-approval.py | 4 ++-- tests/twisted/dispatcher/ensure-rapidly.py | 4 ++-- tests/twisted/dispatcher/exploding-bundles.py | 6 +++--- tests/twisted/dispatcher/fdo-21034.py | 4 ++-- tests/twisted/dispatcher/handle-channels-fails.py | 2 +- tests/twisted/dispatcher/lose-text.py | 2 +- tests/twisted/dispatcher/recover-from-disconnect.py | 2 +- tests/twisted/dispatcher/request-disabled-account.py | 2 +- tests/twisted/dispatcher/respawn-activatable-observers.py | 2 +- tests/twisted/dispatcher/respawn-observers.py | 2 +- tests/twisted/dispatcher/some-delay-approvers.py | 2 +- tests/twisted/dispatcher/undispatchable.py | 2 +- tests/twisted/telepathy-1/clients/AbiWord.client | 4 ++-- tests/twisted/telepathy-1/clients/Logger.client | 2 +- xml/telepathy-types.xml | 4 ++-- 51 files changed, 80 insertions(+), 80 deletions(-) diff --git a/mission-control-plugins/dispatch-operation.c b/mission-control-plugins/dispatch-operation.c index 97bf7806..7b6c592c 100644 --- a/mission-control-plugins/dispatch-operation.c +++ b/mission-control-plugins/dispatch-operation.c @@ -363,7 +363,7 @@ gboolean mcp_dispatch_operation_find_channel_by_type (McpDispatchOperation *self, TpClientFactory *client_factory, guint start_from, - TpHandleType handle_type, + TpEntityType handle_type, GQuark channel_type, guint *ret_index, gchar **ret_dup_path, @@ -391,7 +391,7 @@ mcp_dispatch_operation_find_channel_by_type (McpDispatchOperation *self, !tp_strdiff (tp_asv_get_string (properties, TP_IFACE_CHANNEL ".ChannelType"), channel_type_str) && - tp_asv_get_uint32 (properties, TP_IFACE_CHANNEL ".TargetHandleType", + tp_asv_get_uint32 (properties, TP_IFACE_CHANNEL ".TargetEntityType", &valid) == handle_type && valid) { diff --git a/mission-control-plugins/dispatch-operation.h b/mission-control-plugins/dispatch-operation.h index f4c9ae6a..46c1193c 100644 --- a/mission-control-plugins/dispatch-operation.h +++ b/mission-control-plugins/dispatch-operation.h @@ -54,7 +54,7 @@ GType mcp_dispatch_operation_get_type (void) G_GNUC_CONST; gboolean mcp_dispatch_operation_find_channel_by_type ( McpDispatchOperation *self, TpClientFactory *client_factory, - guint start_from, TpHandleType handle_type, GQuark channel_type, + guint start_from, TpEntityType handle_type, GQuark channel_type, guint *ret_index, gchar **ret_dup_path, GHashTable **ret_ref_immutable_properties, TpChannel **ret_ref_channel); diff --git a/src/mcd-channel.c b/src/mcd-channel.c index 90a541b2..5be3adc4 100644 --- a/src/mcd-channel.c +++ b/src/mcd-channel.c @@ -625,7 +625,7 @@ mcd_channel_new_from_properties (TpConnection *connection, * @object_path: the D-Bus object path of an existing channel. * @type: the channel type. * @handle: the channel handle. - * @handle_type: the #TpHandleType. + * @handle_type: the #TpEntityType. * * Creates a #McdChannel with an associated #TpChannel proxy for the channel * located at @object_path. @@ -636,7 +636,7 @@ mcd_channel_new_from_properties (TpConnection *connection, McdChannel * mcd_channel_new_from_path (TpConnection *connection, const gchar *object_path, const gchar *type, guint handle, - TpHandleType handle_type) + TpEntityType handle_type) { GHashTable *props; GValue v_type = G_VALUE_INIT; @@ -656,7 +656,7 @@ mcd_channel_new_from_path (TpConnection *connection, const gchar *object_path, g_value_init (&v_handle_type, G_TYPE_UINT); g_value_set_uint (&v_handle_type, handle_type); - g_hash_table_insert (props, TP_IFACE_CHANNEL ".TargetHandleType", + g_hash_table_insert (props, TP_IFACE_CHANNEL ".TargetEntityType", &v_handle_type); channel = mcd_channel_new_from_properties (connection, object_path, props); diff --git a/src/mcd-channel.h b/src/mcd-channel.h index 62b4d3f4..8bdf94ed 100644 --- a/src/mcd-channel.h +++ b/src/mcd-channel.h @@ -90,7 +90,7 @@ mcd_channel_new_from_properties (TpConnection *connection, McdChannel *mcd_channel_new_from_path (TpConnection *connection, const gchar *object_path, const gchar *type, guint handle, - TpHandleType handle_type); + TpEntityType handle_type); McdChannelStatus mcd_channel_get_status (McdChannel * channel); const gchar* mcd_channel_get_object_path (McdChannel *channel); diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c index 07313400..64c359d4 100644 --- a/src/mcd-dispatcher.c +++ b/src/mcd-dispatcher.c @@ -1608,11 +1608,11 @@ messages_send_message_start (DBusGMethodInvocation *dbus_context, g_value_init (&target, G_TYPE_STRING); g_value_set_static_string (&c_type, TP_IFACE_CHANNEL_TYPE_TEXT); - g_value_set_uint (&h_type, TP_HANDLE_TYPE_CONTACT); + g_value_set_uint (&h_type, TP_ENTITY_TYPE_CONTACT); g_value_set_string (&target, message->target_id); g_hash_table_insert (props, TP_PROP_CHANNEL_CHANNEL_TYPE, &c_type); - g_hash_table_insert (props, TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, &h_type); + g_hash_table_insert (props, TP_PROP_CHANNEL_TARGET_ENTITY_TYPE, &h_type); g_hash_table_insert (props, TP_PROP_CHANNEL_TARGET_ID, &target); /* compare dispatcher_request_channel: we _are_ the handler for * diff --git a/tests/twisted/account-manager/make-valid.py b/tests/twisted/account-manager/make-valid.py index 71846223..4cb79a81 100644 --- a/tests/twisted/account-manager/make-valid.py +++ b/tests/twisted/account-manager/make-valid.py @@ -115,7 +115,7 @@ def test(q, bus, unused, **kwargs): user_action_time = dbus.Int64(1238582606) request = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.TargetID': 'juliet', }, signature='sv') call_async(q, cd, 'CreateChannel', diff --git a/tests/twisted/account-manager/request-online.py b/tests/twisted/account-manager/request-online.py index f5b7d26a..73332be3 100644 --- a/tests/twisted/account-manager/request-online.py +++ b/tests/twisted/account-manager/request-online.py @@ -31,7 +31,7 @@ import constants as cs def test(q, bus, mc): http_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': 1L, + cs.CHANNEL + '.TargetEntityType': 1L, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_STREAM_TUBE, cs.CHANNEL_TYPE_STREAM_TUBE + '.Service': 'http' diff --git a/tests/twisted/account-requests/cancel.py b/tests/twisted/account-requests/cancel.py index 9b4677d9..2bec7b1d 100644 --- a/tests/twisted/account-requests/cancel.py +++ b/tests/twisted/account-requests/cancel.py @@ -38,7 +38,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') @@ -62,7 +62,7 @@ def test(q, bus, mc): cd = ChannelDispatcher(bus) request = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.TargetID': 'juliet', }, signature='sv') (request_path, immutable_props) = cd.CreateChannel(account.object_path, diff --git a/tests/twisted/account-requests/create-text.py b/tests/twisted/account-requests/create-text.py index 7337ab34..f52346e9 100644 --- a/tests/twisted/account-requests/create-text.py +++ b/tests/twisted/account-requests/create-text.py @@ -38,7 +38,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') @@ -66,7 +66,7 @@ def test_channel_creation(q, bus, account, client, conn, ensure): cd = ChannelDispatcher(bus) request = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.TargetID': 'juliet', }, signature='sv') diff --git a/tests/twisted/account-requests/delete-account-during-request.py b/tests/twisted/account-requests/delete-account-during-request.py index 248c83cb..2f2a33ce 100644 --- a/tests/twisted/account-requests/delete-account-during-request.py +++ b/tests/twisted/account-requests/delete-account-during-request.py @@ -38,7 +38,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') @@ -55,7 +55,7 @@ def test(q, bus, mc): cd = ChannelDispatcher(bus) request = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.TargetID': 'juliet', }, signature='sv') call_async(q, cd, 'CreateChannel', account.object_path, diff --git a/tests/twisted/capabilities/contact-caps.py b/tests/twisted/capabilities/contact-caps.py index 320a8c5e..cc5a19b3 100644 --- a/tests/twisted/capabilities/contact-caps.py +++ b/tests/twisted/capabilities/contact-caps.py @@ -39,12 +39,12 @@ def test(q, bus, mc): # this must match the .client file abi_contact_fixed_properties = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_STREAM_TUBE, - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL_TYPE_STREAM_TUBE + '.Service': 'x-abiword', }, signature='sv') abi_room_fixed_properties = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_STREAM_TUBE, - cs.CHANNEL + '.TargetHandleType': cs.HT_ROOM, + cs.CHANNEL + '.TargetEntityType': cs.HT_ROOM, cs.CHANNEL_TYPE_STREAM_TUBE + '.Service': 'x-abiword', }, signature='sv') @@ -113,7 +113,7 @@ def test(q, bus, mc): q.attach_to_bus(irssi_bus) irssi_fixed_properties = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, - cs.CHANNEL + '.TargetHandleType': cs.HT_ROOM, + cs.CHANNEL + '.TargetEntityType': cs.HT_ROOM, }, signature='sv') irssi = SimulatedClient(q, irssi_bus, 'Irssi', observe=[], approve=[], handle=[irssi_fixed_properties], diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py index 8a73f129..aa21e077 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/crash-recovery/crash-recovery.py b/tests/twisted/crash-recovery/crash-recovery.py index 432082a0..4ebef70c 100644 --- a/tests/twisted/crash-recovery/crash-recovery.py +++ b/tests/twisted/crash-recovery/crash-recovery.py @@ -65,7 +65,7 @@ def test(q, bus, unused, **kwargs): preseed(q, bus, fake_accounts_service) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') diff --git a/tests/twisted/dispatcher/already-has-channel.py b/tests/twisted/dispatcher/already-has-channel.py index 6f5e6694..d1fbe62e 100644 --- a/tests/twisted/dispatcher/already-has-channel.py +++ b/tests/twisted/dispatcher/already-has-channel.py @@ -36,7 +36,7 @@ def test(q, bus, mc): simulated_cm, account = create_fakecm_account(q, bus, mc, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') diff --git a/tests/twisted/dispatcher/approver-fails.py b/tests/twisted/dispatcher/approver-fails.py index 1b7dc0f6..1a3b9985 100644 --- a/tests/twisted/dispatcher/approver-fails.py +++ b/tests/twisted/dispatcher/approver-fails.py @@ -38,7 +38,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') diff --git a/tests/twisted/dispatcher/bypass-approval.py b/tests/twisted/dispatcher/bypass-approval.py index 149cd7a2..0fd23026 100644 --- a/tests/twisted/dispatcher/bypass-approval.py +++ b/tests/twisted/dispatcher/bypass-approval.py @@ -35,11 +35,11 @@ text_fixed_properties = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') contact_text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') urgent_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, 'com.example.Urgency.Urgent': True, }, signature='sv') diff --git a/tests/twisted/dispatcher/cancel.py b/tests/twisted/dispatcher/cancel.py index 9e04a539..8cb5212f 100644 --- a/tests/twisted/dispatcher/cancel.py +++ b/tests/twisted/dispatcher/cancel.py @@ -38,7 +38,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') @@ -70,7 +70,7 @@ def test_channel_creation(q, bus, account, client, conn, # chat UI calls ChannelDispatcher.CreateChannel request = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.TargetID': 'juliet', }, signature='sv') call_async(q, cd, 'CreateChannel', diff --git a/tests/twisted/dispatcher/capture-bundle.py b/tests/twisted/dispatcher/capture-bundle.py index d9a39e54..5bae0562 100644 --- a/tests/twisted/dispatcher/capture-bundle.py +++ b/tests/twisted/dispatcher/capture-bundle.py @@ -38,11 +38,11 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') voip_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_CALL, }, signature='sv') @@ -207,7 +207,7 @@ def test(q, bus, mc): channel_properties = dbus.Dictionary(text_fixed_properties, signature='sv') - channel_properties[cs.CHANNEL + '.TargetHandleType'] = cs.HT_CONTACT + channel_properties[cs.CHANNEL + '.TargetEntityType'] = cs.HT_CONTACT channel_properties[cs.CHANNEL + '.TargetID'] = 'juliet' channel_properties[cs.CHANNEL + '.TargetHandle'] = \ conn.ensure_handle(cs.HT_CONTACT, 'juliet') diff --git a/tests/twisted/dispatcher/connect-for-request.py b/tests/twisted/dispatcher/connect-for-request.py index 5647751b..12f141bd 100644 --- a/tests/twisted/dispatcher/connect-for-request.py +++ b/tests/twisted/dispatcher/connect-for-request.py @@ -67,7 +67,7 @@ def test(q, bus, mc): request = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.TargetID': 'juliet', }, signature='sv') call_async(q, cd, 'CreateChannel', diff --git a/tests/twisted/dispatcher/create-at-startup.py b/tests/twisted/dispatcher/create-at-startup.py index 5eb7408e..2151d5ff 100644 --- a/tests/twisted/dispatcher/create-at-startup.py +++ b/tests/twisted/dispatcher/create-at-startup.py @@ -65,7 +65,7 @@ def test(q, bus, unused, **kwargs): preseed(q, bus, fake_accounts_service) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') @@ -96,7 +96,7 @@ def test(q, bus, unused, **kwargs): request = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.TargetID': 'bob.page@versalife.com', }, signature='sv') call_async(q, cd, 'CreateChannel', diff --git a/tests/twisted/dispatcher/create-delayed-by-mini-plugin.py b/tests/twisted/dispatcher/create-delayed-by-mini-plugin.py index 1d675546..3a733101 100644 --- a/tests/twisted/dispatcher/create-delayed-by-mini-plugin.py +++ b/tests/twisted/dispatcher/create-delayed-by-mini-plugin.py @@ -76,7 +76,7 @@ def test(q, bus, mc): e_numbers = e_numbers1 + e_numbers2 fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': DELAYED_CTYPE, }, signature='sv') @@ -115,7 +115,7 @@ def test(q, bus, mc): # UI calls ChannelDispatcher.CreateChannel request = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': DELAYED_CTYPE, - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.TargetID': target_id, }, signature='sv') call_async(q, cd, 'CreateChannel', diff --git a/tests/twisted/dispatcher/create-handler-fails.py b/tests/twisted/dispatcher/create-handler-fails.py index a24eecf0..b8ee0a57 100644 --- a/tests/twisted/dispatcher/create-handler-fails.py +++ b/tests/twisted/dispatcher/create-handler-fails.py @@ -38,7 +38,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') @@ -67,7 +67,7 @@ def test_channel_creation(q, bus, account, client, conn, ensure): # chat UI calls ChannelDispatcher.EnsureChannel or CreateChannel request = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.TargetID': 'juliet', }, signature='sv') call_async(q, cd, diff --git a/tests/twisted/dispatcher/create-hints.py b/tests/twisted/dispatcher/create-hints.py index a89e9dbc..97410829 100644 --- a/tests/twisted/dispatcher/create-hints.py +++ b/tests/twisted/dispatcher/create-hints.py @@ -37,7 +37,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') @@ -67,7 +67,7 @@ def test_channel_creation(q, bus, account, client, conn, # to be a separate method in Telepathy 0.x. request = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': channel_type, - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.TargetID': 'juliet', }, signature='sv') call_async(q, cd, diff --git a/tests/twisted/dispatcher/create-no-preferred-handler.py b/tests/twisted/dispatcher/create-no-preferred-handler.py index ad017e35..0d8fd0cc 100644 --- a/tests/twisted/dispatcher/create-no-preferred-handler.py +++ b/tests/twisted/dispatcher/create-no-preferred-handler.py @@ -38,7 +38,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') # Emulate a handler that only wants to get outgoing channels, as a @@ -73,7 +73,7 @@ def test_channel_creation(q, bus, account, client, conn, ensure): # chat UI calls ChannelDispatcher.EnsureChannel or CreateChannel request = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.TargetID': 'juliet', }, signature='sv') call_async(q, cd, diff --git a/tests/twisted/dispatcher/create-rejected-by-mini-plugin.py b/tests/twisted/dispatcher/create-rejected-by-mini-plugin.py index 427f21fc..8fe9c444 100644 --- a/tests/twisted/dispatcher/create-rejected-by-mini-plugin.py +++ b/tests/twisted/dispatcher/create-rejected-by-mini-plugin.py @@ -51,7 +51,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': FORBIDDEN_CTYPE, }, signature='sv') @@ -70,7 +70,7 @@ def test(q, bus, mc): # UI calls ChannelDispatcher.CreateChannel request = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': FORBIDDEN_CTYPE, - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.TargetID': 'juliet', }, signature='sv') call_async(q, cd, 'CreateChannel', diff --git a/tests/twisted/dispatcher/create-text.py b/tests/twisted/dispatcher/create-text.py index baae37f1..eb8a8228 100644 --- a/tests/twisted/dispatcher/create-text.py +++ b/tests/twisted/dispatcher/create-text.py @@ -38,7 +38,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') @@ -86,7 +86,7 @@ def test_channel_creation(q, bus, account, client, conn, # chat UI calls ChannelDispatcher.EnsureChannel or CreateChannel request = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': channel_type, - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.TargetID': 'juliet', }, signature='sv') call_async(q, cd, diff --git a/tests/twisted/dispatcher/created-behind-our-back.py b/tests/twisted/dispatcher/created-behind-our-back.py index 8109e675..8b0f0f89 100644 --- a/tests/twisted/dispatcher/created-behind-our-back.py +++ b/tests/twisted/dispatcher/created-behind-our-back.py @@ -43,7 +43,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') diff --git a/tests/twisted/dispatcher/delay-approvers.py b/tests/twisted/dispatcher/delay-approvers.py index be11acc7..b17051de 100644 --- a/tests/twisted/dispatcher/delay-approvers.py +++ b/tests/twisted/dispatcher/delay-approvers.py @@ -33,7 +33,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') diff --git a/tests/twisted/dispatcher/delay-then-call-handle-with.py b/tests/twisted/dispatcher/delay-then-call-handle-with.py index f0a05afb..418bfa25 100644 --- a/tests/twisted/dispatcher/delay-then-call-handle-with.py +++ b/tests/twisted/dispatcher/delay-then-call-handle-with.py @@ -33,7 +33,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') diff --git a/tests/twisted/dispatcher/delay-then-dont-call-approvers.py b/tests/twisted/dispatcher/delay-then-dont-call-approvers.py index b30377e3..c80d1fff 100644 --- a/tests/twisted/dispatcher/delay-then-dont-call-approvers.py +++ b/tests/twisted/dispatcher/delay-then-dont-call-approvers.py @@ -33,7 +33,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') diff --git a/tests/twisted/dispatcher/dispatch-activatable.py b/tests/twisted/dispatcher/dispatch-activatable.py index c9850eb9..87a07a92 100644 --- a/tests/twisted/dispatcher/dispatch-activatable.py +++ b/tests/twisted/dispatcher/dispatch-activatable.py @@ -50,7 +50,7 @@ def test(q, bus, mc): channel_properties = dbus.Dictionary(abiword_fixed_properties, signature='sv') - channel_properties[cs.CHANNEL + '.TargetHandleType'] = cs.HT_CONTACT + channel_properties[cs.CHANNEL + '.TargetEntityType'] = cs.HT_CONTACT channel_properties[cs.CHANNEL + '.TargetID'] = 'juliet' channel_properties[cs.CHANNEL + '.TargetHandle'] = \ conn.ensure_handle(cs.HT_CONTACT, 'juliet') diff --git a/tests/twisted/dispatcher/dispatch-before-connected.py b/tests/twisted/dispatcher/dispatch-before-connected.py index f9976333..3b29c527 100644 --- a/tests/twisted/dispatcher/dispatch-before-connected.py +++ b/tests/twisted/dispatcher/dispatch-before-connected.py @@ -41,7 +41,7 @@ def test(q, bus, mc): # automatically verification_filter = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': 0, + cs.CHANNEL + '.TargetEntityType': 0, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_SERVER_TLS_CONNECTION, }, signature='sv') diff --git a/tests/twisted/dispatcher/dispatch-delayed-by-mini-plugin.py b/tests/twisted/dispatcher/dispatch-delayed-by-mini-plugin.py index e7836ec7..3ce61409 100644 --- a/tests/twisted/dispatcher/dispatch-delayed-by-mini-plugin.py +++ b/tests/twisted/dispatcher/dispatch-delayed-by-mini-plugin.py @@ -31,7 +31,7 @@ from mctest import exec_test, SimulatedConnection, SimulatedClient, \ import constants as cs text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') diff --git a/tests/twisted/dispatcher/dispatch-rejected-by-mini-plugin.py b/tests/twisted/dispatcher/dispatch-rejected-by-mini-plugin.py index 3f79f1c4..2ee14cc2 100644 --- a/tests/twisted/dispatcher/dispatch-rejected-by-mini-plugin.py +++ b/tests/twisted/dispatcher/dispatch-rejected-by-mini-plugin.py @@ -37,7 +37,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') diff --git a/tests/twisted/dispatcher/dispatch-text.py b/tests/twisted/dispatcher/dispatch-text.py index b8a008c5..d947a9dd 100644 --- a/tests/twisted/dispatcher/dispatch-text.py +++ b/tests/twisted/dispatcher/dispatch-text.py @@ -38,7 +38,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') diff --git a/tests/twisted/dispatcher/ensure-and-redispatch.py b/tests/twisted/dispatcher/ensure-and-redispatch.py index 36261572..cb57d64b 100644 --- a/tests/twisted/dispatcher/ensure-and-redispatch.py +++ b/tests/twisted/dispatcher/ensure-and-redispatch.py @@ -37,7 +37,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') @@ -101,7 +101,7 @@ def test_channel_creation(q, bus, account, client, conn): # chat UI calls ChannelDispatcher.EnsureChannel request = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.TargetID': 'juliet', }, signature='sv') call_async(q, cd, 'EnsureChannel', @@ -230,7 +230,7 @@ def test_channel_redispatch(q, bus, account, client, conn, channel, # UI calls ChannelDispatcher.EnsureChannel again request = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.TargetID': 'juliet', }, signature='sv') call_async(q, cd, 'EnsureChannel', diff --git a/tests/twisted/dispatcher/ensure-is-approval.py b/tests/twisted/dispatcher/ensure-is-approval.py index c8a3af93..25e03124 100644 --- a/tests/twisted/dispatcher/ensure-is-approval.py +++ b/tests/twisted/dispatcher/ensure-is-approval.py @@ -47,7 +47,7 @@ def test(q, bus, mc): cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') @@ -177,7 +177,7 @@ def test(q, bus, mc): request = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.TargetID': 'juliet', }, signature='sv') call_async(q, cd, 'EnsureChannel', diff --git a/tests/twisted/dispatcher/ensure-rapidly.py b/tests/twisted/dispatcher/ensure-rapidly.py index d33b2657..c3e2d0d0 100644 --- a/tests/twisted/dispatcher/ensure-rapidly.py +++ b/tests/twisted/dispatcher/ensure-rapidly.py @@ -37,7 +37,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') @@ -75,7 +75,7 @@ def test_channel_creation(q, bus, account, client, conn, # chat UI calls ChannelDispatcher.EnsureChannel request = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.TargetID': 'juliet', }, signature='sv') call_async(q, cd, 'EnsureChannel', diff --git a/tests/twisted/dispatcher/exploding-bundles.py b/tests/twisted/dispatcher/exploding-bundles.py index 8c0bd058..c8fd3882 100644 --- a/tests/twisted/dispatcher/exploding-bundles.py +++ b/tests/twisted/dispatcher/exploding-bundles.py @@ -37,17 +37,17 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') media_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_CALL, }, signature='sv') misc_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': 'com.example.Extension', }, signature='sv') diff --git a/tests/twisted/dispatcher/fdo-21034.py b/tests/twisted/dispatcher/fdo-21034.py index b850603b..dcaeff9a 100644 --- a/tests/twisted/dispatcher/fdo-21034.py +++ b/tests/twisted/dispatcher/fdo-21034.py @@ -37,7 +37,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') @@ -54,7 +54,7 @@ def test(q, bus, mc): # chat UI calls ChannelDispatcher.EnsureChannel or CreateChannel request = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.TargetID': 'juliet', }, signature='sv') diff --git a/tests/twisted/dispatcher/handle-channels-fails.py b/tests/twisted/dispatcher/handle-channels-fails.py index 771a11a2..ca468d80 100644 --- a/tests/twisted/dispatcher/handle-channels-fails.py +++ b/tests/twisted/dispatcher/handle-channels-fails.py @@ -38,7 +38,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') vague_fixed_properties = dbus.Dictionary({ diff --git a/tests/twisted/dispatcher/lose-text.py b/tests/twisted/dispatcher/lose-text.py index 4aa73350..2e3a644e 100644 --- a/tests/twisted/dispatcher/lose-text.py +++ b/tests/twisted/dispatcher/lose-text.py @@ -38,7 +38,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') diff --git a/tests/twisted/dispatcher/recover-from-disconnect.py b/tests/twisted/dispatcher/recover-from-disconnect.py index 86baa10f..dcb95bcc 100644 --- a/tests/twisted/dispatcher/recover-from-disconnect.py +++ b/tests/twisted/dispatcher/recover-from-disconnect.py @@ -27,7 +27,7 @@ from mctest import exec_test, SimulatedConnection, create_fakecm_account,\ import constants as cs text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') diff --git a/tests/twisted/dispatcher/request-disabled-account.py b/tests/twisted/dispatcher/request-disabled-account.py index 703a4c9d..67259d04 100644 --- a/tests/twisted/dispatcher/request-disabled-account.py +++ b/tests/twisted/dispatcher/request-disabled-account.py @@ -66,7 +66,7 @@ def test(q, bus, mc): request = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.TargetID': 'juliet', }, signature='sv') call_async(q, cd, 'CreateChannel', diff --git a/tests/twisted/dispatcher/respawn-activatable-observers.py b/tests/twisted/dispatcher/respawn-activatable-observers.py index 45005cca..bb09c7bd 100644 --- a/tests/twisted/dispatcher/respawn-activatable-observers.py +++ b/tests/twisted/dispatcher/respawn-activatable-observers.py @@ -38,7 +38,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL + '.Type.RespawnObservers' }, signature='sv') diff --git a/tests/twisted/dispatcher/respawn-observers.py b/tests/twisted/dispatcher/respawn-observers.py index 76bb3d4f..c05212e4 100644 --- a/tests/twisted/dispatcher/respawn-observers.py +++ b/tests/twisted/dispatcher/respawn-observers.py @@ -38,7 +38,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') diff --git a/tests/twisted/dispatcher/some-delay-approvers.py b/tests/twisted/dispatcher/some-delay-approvers.py index 4fb6c6d5..b104c7b6 100644 --- a/tests/twisted/dispatcher/some-delay-approvers.py +++ b/tests/twisted/dispatcher/some-delay-approvers.py @@ -33,7 +33,7 @@ def test(q, bus, mc): conn = enable_fakecm_account(q, bus, mc, account, params) text_fixed_properties = dbus.Dictionary({ - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, }, signature='sv') diff --git a/tests/twisted/dispatcher/undispatchable.py b/tests/twisted/dispatcher/undispatchable.py index d98b9d93..a4917416 100644 --- a/tests/twisted/dispatcher/undispatchable.py +++ b/tests/twisted/dispatcher/undispatchable.py @@ -40,7 +40,7 @@ def test(q, bus, mc): text_fixed_properties = dbus.Dictionary({ cs.CHANNEL + '.ChannelType': cs.CHANNEL_TYPE_TEXT, - cs.CHANNEL + '.TargetHandleType': cs.HT_CONTACT, + cs.CHANNEL + '.TargetEntityType': cs.HT_CONTACT, }, signature='sv') # subscribe to the OperationList interface (MC assumes that until this diff --git a/tests/twisted/telepathy-1/clients/AbiWord.client b/tests/twisted/telepathy-1/clients/AbiWord.client index cd91c9f9..f38b51bd 100644 --- a/tests/twisted/telepathy-1/clients/AbiWord.client +++ b/tests/twisted/telepathy-1/clients/AbiWord.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.StreamTube1 -im.telepathy.v1.Channel.TargetHandleType u=1 +im.telepathy.v1.Channel.TargetEntityType u=1 im.telepathy.v1.Channel.Type.StreamTube1.Service s=x-abiword [im.telepathy.v1.Client.Handler.HandlerChannelFilter 1] im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.StreamTube1 -im.telepathy.v1.Channel.TargetHandleType u=2 +im.telepathy.v1.Channel.TargetEntityType u=2 im.telepathy.v1.Channel.Type.StreamTube1.Service s=x-abiword [im.telepathy.v1.Client.Handler.Capabilities] diff --git a/tests/twisted/telepathy-1/clients/Logger.client b/tests/twisted/telepathy-1/clients/Logger.client index 2ec2a7db..1282bc34 100644 --- a/tests/twisted/telepathy-1/clients/Logger.client +++ b/tests/twisted/telepathy-1/clients/Logger.client @@ -6,5 +6,5 @@ Recover=true [im.telepathy.v1.Client.Observer.ObserverChannelFilter 0] im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.RespawnObservers -im.telepathy.v1.Channel.TargetHandleType u=1 +im.telepathy.v1.Channel.TargetEntityType u=1 diff --git a/xml/telepathy-types.xml b/xml/telepathy-types.xml index 8225aa03..f9f1a82e 100644 --- a/xml/telepathy-types.xml +++ b/xml/telepathy-types.xml @@ -13,7 +13,7 @@

Channel classes SHOULD always include the keys org.freedesktop.Telepathy.Channel.ChannelType and - org.freedesktop.Telepathy.Channel.TargetHandleType. + org.freedesktop.Telepathy.Channel.TargetEntityType.

@@ -77,7 +77,7 @@

Each dictionary MUST contain the keys org.freedesktop.Telepathy.Channel.ChannelType, - org.freedesktop.Telepathy.Channel.TargetHandleType, + org.freedesktop.Telepathy.Channel.TargetEntityType, org.freedesktop.Telepathy.Channel.TargetHandle and org.freedesktop.Telepathy.Channel.TargetID. -- cgit v1.2.3