summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2011-03-30 12:55:59 +0100
committerJonny Lamb <jonny.lamb@collabora.co.uk>2011-03-30 12:58:32 +0100
commita93fffacea04413c7855e9ba3807ca7319a03a9d (patch)
treecf2b3a8400bf9ef94ce63c5015c4b729783706df
parent18b44dd2909b2cb75e8cc91a80f6e6b8ba253a7f (diff)
conference/im channel: properly reference conference interface constantHEADmaster
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-rw-r--r--butterfly/channel/conference.py2
-rw-r--r--butterfly/channel/im.py2
2 files changed, 4 insertions, 0 deletions
diff --git a/butterfly/channel/conference.py b/butterfly/channel/conference.py
index a078dfe..4e54e58 100644
--- a/butterfly/channel/conference.py
+++ b/butterfly/channel/conference.py
@@ -31,6 +31,8 @@ __all__ = ['ButterflyConferenceChannel']
logger = logging.getLogger('Butterfly.ConferenceChannel')
+from telepathy.interfaces import CHANNEL_INTERFACE_CONFERENCE
+
class ButterflyConferenceChannel(
ButterflyMucChannel,
telepathy.server.ChannelInterfaceConference):
diff --git a/butterfly/channel/im.py b/butterfly/channel/im.py
index ac8dd44..01a76af 100644
--- a/butterfly/channel/im.py
+++ b/butterfly/channel/im.py
@@ -34,6 +34,8 @@ __all__ = ['ButterflyImChannel']
logger = logging.getLogger('Butterfly.ImChannel')
+from telepathy.interfaces import CHANNEL_INTERFACE_CONFERENCE
+
class ButterflyImChannel(ButterflyTextChannel):
def __init__(self, conn, manager, conversation, props, object_path=None):