diff options
| author | Krzysztof Klinikowski <kkszysiu@gmail.com> | 2010-05-27 01:06:55 +0200 |
|---|---|---|
| committer | Krzysztof Klinikowski <kkszysiu@gmail.com> | 2010-05-27 01:06:55 +0200 |
| commit | 687fcd66f074974aefde7d3bd879cbb4065fedb4 (patch) | |
| tree | 9a36be86bb6da5fb77fa33cb304696b53cc432e1 /sunshine/channel/text.py | |
| parent | 4fdbc7a2a0f0735e2f616009bf7491e033e6b63e (diff) | |
channel: add SunshineChannel class to deal with Initiator props, from http://git.collabora.co.uk/?p=telepathy-butterfly.git;a=commit;h=eb4ec881377241f49d757af88e5af1f3e1ee4bca
Diffstat (limited to 'sunshine/channel/text.py')
| -rw-r--r-- | sunshine/channel/text.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sunshine/channel/text.py b/sunshine/channel/text.py index 469db33..2e5fb80 100644 --- a/sunshine/channel/text.py +++ b/sunshine/channel/text.py @@ -26,13 +26,15 @@ import telepathy from sunshine.util.decorator import async, escape from sunshine.handle import SunshineHandleFactory +from sunshine.channel import SunshineChannel __all__ = ['SunshineTextChannel'] logger = logging.getLogger('Sunshine.TextChannel') -class SunshineTextChannel(telepathy.server.ChannelTypeText, +class SunshineTextChannel(SunshineChannel, + telepathy.server.ChannelTypeText, telepathy.server.ChannelInterfaceChatState): def __init__(self, conn, manager, conversation, props, object_path=None): @@ -43,6 +45,7 @@ class SunshineTextChannel(telepathy.server.ChannelTypeText, self.handle = handle telepathy.server.ChannelTypeText.__init__(self, conn, manager, props, object_path=None) + SunshineChannel.__init__(self, conn, props) telepathy.server.ChannelInterfaceChatState.__init__(self) def Send(self, message_type, text): |