summaryrefslogtreecommitdiff
path: root/sunshine/channel
diff options
context:
space:
mode:
Diffstat (limited to 'sunshine/channel')
-rw-r--r--sunshine/channel/group.py2
-rw-r--r--sunshine/channel/text.py8
2 files changed, 5 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)