diff options
| author | Krzysztof <kkszysiu@gmail.com> | 2011-03-27 16:34:24 +0200 |
|---|---|---|
| committer | Krzysztof <kkszysiu@gmail.com> | 2011-03-27 16:34:24 +0200 |
| commit | 94f7a69b88912af946e0bc06c9b99aae1de23761 (patch) | |
| tree | 075df63634e5562fd0adf3d6f8c7356bfff5e4aa /sunshine | |
| parent | 0a42861eebd3bcffdf4995001645361ae23d8c88 (diff) | |
Revert "Fixes in channel dispatching."
This reverts commit e80cab865fb730eeeadfbd23f3b469f4d542f2cd.
Diffstat (limited to 'sunshine')
| -rw-r--r-- | sunshine/channel/group.py | 2 | ||||
| -rw-r--r-- | sunshine/channel/text.py | 8 | ||||
| -rw-r--r-- | sunshine/channel_manager.py | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/sunshine/channel/group.py b/sunshine/channel/group.py index 9c9fc20..ced603a 100644 --- a/sunshine/channel/group.py +++ b/sunshine/channel/group.py @@ -39,7 +39,7 @@ logger = logging.getLogger('Sunshine.GroupChannel') class SunshineGroupChannel(SunshineListChannel): - def __init__(self, connection, manager, props, object_path): + def __init__(self, connection, manager, props, object_path=None): self.__pending_add = [] self.__pending_remove = [] self.conn = connection diff --git a/sunshine/channel/text.py b/sunshine/channel/text.py index 76a61b5..0f36366 100644 --- a/sunshine/channel/text.py +++ b/sunshine/channel/text.py @@ -41,7 +41,7 @@ class SunshineTextChannel(SunshineChannel, telepathy.server.ChannelInterfaceChatState, ChannelInterfaceMessages): - def __init__(self, conn, manager, conversation, props, object_path): + def __init__(self, conn, manager, conversation, props, object_path=None): _, surpress_handler, handle = manager._get_type_requested_handle(props) self._recv_id = 0 self._conn_ref = weakref.ref(conn) @@ -50,7 +50,7 @@ class SunshineTextChannel(SunshineChannel, self._pending_messages2 = {} self.handle = handle - telepathy.server.ChannelTypeText.__init__(self, conn, manager, props, object_path) + telepathy.server.ChannelTypeText.__init__(self, conn, manager, props, object_path=None) SunshineChannel.__init__(self, conn, props) telepathy.server.ChannelInterfaceChatState.__init__(self) ChannelInterfaceMessages.__init__(self) @@ -151,7 +151,7 @@ class SunshineTextChannel(SunshineChannel, class SunshineRoomTextChannel(telepathy.server.ChannelTypeText, telepathy.server.ChannelInterfaceGroup): - def __init__(self, conn, manager, conversation, props, object_path): + def __init__(self, conn, manager, conversation, props, object_path=None): _, surpress_handler, handle = manager._get_type_requested_handle(props) self._recv_id = 0 self._conn_ref = weakref.ref(conn) @@ -161,7 +161,7 @@ class SunshineRoomTextChannel(telepathy.server.ChannelTypeText, telepathy.server self.contacts = conversation self.handle = handle - telepathy.server.ChannelTypeText.__init__(self, conn, manager, props, object_path) + telepathy.server.ChannelTypeText.__init__(self, conn, manager, props, object_path=None) telepathy.server.ChannelInterfaceGroup.__init__(self) self.GroupFlagsChanged(telepathy.CHANNEL_GROUP_FLAG_CAN_ADD, 0) diff --git a/sunshine/channel_manager.py b/sunshine/channel_manager.py index 647e024..cce3321 100644 --- a/sunshine/channel_manager.py +++ b/sunshine/channel_manager.py @@ -92,6 +92,12 @@ class SunshineChannelManager(telepathy.server.ChannelManager): ({telepathy.CHANNEL_INTERFACE + '.ChannelType': telepathy.CHANNEL_TYPE_TEXT, telepathy.CHANNEL_INTERFACE + '.TargetHandleType': dbus.UInt32(telepathy.HANDLE_TYPE_ROOM)}, +# [ +# CHANNEL_INTERFACE_CONFERENCE + '.InitialChannels', +# CHANNEL_INTERFACE_CONFERENCE + '.InitialInviteeHandles', +# CHANNEL_INTERFACE_CONFERENCE + '.InitialInviteeIDs', +# CHANNEL_INTERFACE_CONFERENCE + '.InitialMessage', +# CHANNEL_INTERFACE_CONFERENCE + '.SupportsNonMerges'] [telepathy.CHANNEL_INTERFACE + '.TargetHandle', telepathy.CHANNEL_INTERFACE + '.TargetID']), ] |