diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-02-13 10:36:10 +0100 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-02-13 13:15:26 +0100 |
commit | 5ee1b1beacde73e6f256de010f278dac78b8457c (patch) | |
tree | eb3e26cb2c0bf86185e0193b823add51f25fb1bd /telepathy-farstream | |
parent | 3bf07c96ef369adf085c86601c72c6a628bfaf41 (diff) |
TargetHandleType has been renamed to TargetEntityType
Diffstat (limited to 'telepathy-farstream')
-rw-r--r-- | telepathy-farstream/examples/call-handler.c | 4 | ||||
-rw-r--r-- | telepathy-farstream/examples/python/callhandler.py | 8 | ||||
-rw-r--r-- | telepathy-farstream/examples/python/callui.py | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/telepathy-farstream/examples/call-handler.c b/telepathy-farstream/examples/call-handler.c index 8d8291312..bde8bb4e9 100644 --- a/telepathy-farstream/examples/call-handler.c +++ b/telepathy-farstream/examples/call-handler.c @@ -608,7 +608,7 @@ main (int argc, char **argv) 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_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT, TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_AUDIO, G_TYPE_BOOLEAN, TRUE, @@ -618,7 +618,7 @@ main (int argc, char **argv) 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_PROP_CHANNEL_TARGET_ENTITY_TYPE, G_TYPE_UINT, TP_ENTITY_TYPE_CONTACT, TP_PROP_CHANNEL_TYPE_CALL1_INITIAL_VIDEO, G_TYPE_BOOLEAN, TRUE, diff --git a/telepathy-farstream/examples/python/callhandler.py b/telepathy-farstream/examples/python/callhandler.py index 71af24cd9..0d99ca32f 100644 --- a/telepathy-farstream/examples/python/callhandler.py +++ b/telepathy-farstream/examples/python/callhandler.py @@ -61,22 +61,22 @@ class CallHandler(dbus.service.Object, telepathy.server.DBusProperties): def _get_filters(self): return dbus.Array ([ { CHANNEL_INTERFACE + ".ChannelType": CHANNEL_TYPE_CALL, - CHANNEL_INTERFACE + ".TargetHandleType": + CHANNEL_INTERFACE + ".TargetEntityType": CONNECTION_HANDLE_TYPE_CONTACT, CALL_INITIAL_AUDIO: True, }, { CHANNEL_INTERFACE + ".ChannelType": CHANNEL_TYPE_CALL, - CHANNEL_INTERFACE + ".TargetHandleType": + CHANNEL_INTERFACE + ".TargetEntityType": CONNECTION_HANDLE_TYPE_CONTACT, CALL_INITIAL_VIDEO: True, }, { CHANNEL_INTERFACE + ".ChannelType": CHANNEL_TYPE_CALL, - CHANNEL_INTERFACE + ".TargetHandleType": + CHANNEL_INTERFACE + ".TargetEntityType": CONNECTION_HANDLE_TYPE_ROOM, CALL_INITIAL_AUDIO: True, }, { CHANNEL_INTERFACE + ".ChannelType": CHANNEL_TYPE_CALL, - CHANNEL_INTERFACE + ".TargetHandleType": + CHANNEL_INTERFACE + ".TargetEntityType": CONNECTION_HANDLE_TYPE_ROOM, CALL_INITIAL_VIDEO: True, } diff --git a/telepathy-farstream/examples/python/callui.py b/telepathy-farstream/examples/python/callui.py index 9e7558f6c..570f70f7d 100644 --- a/telepathy-farstream/examples/python/callui.py +++ b/telepathy-farstream/examples/python/callui.py @@ -47,7 +47,7 @@ class CallChannelRequest: props = { CHANNEL_INTERFACE + ".ChannelType": CHANNEL_TYPE_CALL, - CHANNEL_INTERFACE + ".TargetHandleType": calltype, + CHANNEL_INTERFACE + ".TargetEntityType": calltype, CHANNEL_INTERFACE + ".TargetID": contact, } @@ -76,7 +76,7 @@ class CallChannelRequest: class Account: CALL_CLASS = { CHANNEL_INTERFACE + '.ChannelType': CHANNEL_TYPE_CALL, - CHANNEL_INTERFACE + '.TargetHandleType': HANDLE_TYPE_CONTACT + CHANNEL_INTERFACE + '.TargetEntityType': HANDLE_TYPE_CONTACT } def __init__(self, bus, path): @@ -103,7 +103,7 @@ class Account: conn = self.bus.get_object (path[1:].replace("/","."), path) yours, channel, properties = conn.EnsureChannel ( { CHANNEL_INTERFACE + ".ChannelType": CHANNEL_TYPE_CONTACT_LIST, - CHANNEL_INTERFACE + ".TargetHandleType": HANDLE_TYPE_LIST, + CHANNEL_INTERFACE + ".TargetEntityType": HANDLE_TYPE_LIST, CHANNEL_INTERFACE + ".TargetID": "subscribe" }, dbus_interface = CONNECTION_INTERFACE_REQUESTS |