From 7b8b1390728940678226c5587ee9918f1dad58cb Mon Sep 17 00:00:00 2001 From: Ed Page Date: Tue, 5 Jan 2010 20:41:45 -0600 Subject: [PATCH] Prefixing more hacks with HACK to make it easier to remove later --- src/channel/call.py | 6 +++--- src/channel/contact_list.py | 6 +++--- src/channel/text.py | 6 +++--- src/channel_manager.py | 4 ++-- src/connection.py | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/channel/call.py b/src/channel/call.py index 19837dc..abe820f 100644 --- a/src/channel/call.py +++ b/src/channel/call.py @@ -20,10 +20,10 @@ class CallChannel( self._props = props try: - # Older python-telepathy way + # HACK Older python-telepathy way telepathy.server.ChannelTypeStreamedMedia.__init__(self, connection, None) except TypeError: - # Newer python-telepathy way + # HACK Newer python-telepathy way telepathy.server.ChannelTypeStreamedMedia.__init__(self, connection, manager, props) telepathy.server.ChannelInterfaceCallState.__init__(self) telepathy.server.ChannelInterfaceGroup.__init__(self) @@ -49,7 +49,7 @@ class CallChannel( def close(self): telepathy.server.ChannelTypeStreamedMedia.Close(self) if self._manager.channel_exists(self._props): - # Older python-telepathy requires doing this manually + # HACK Older python-telepathy requires doing this manually self._manager.remove_channel(self) self.remove_from_connection() diff --git a/src/channel/contact_list.py b/src/channel/contact_list.py index 111ae2a..aa5ccc9 100644 --- a/src/channel/contact_list.py +++ b/src/channel/contact_list.py @@ -22,10 +22,10 @@ class AbstractListChannel( self._props = props try: - # Older python-telepathy way + # HACK Older python-telepathy way telepathy.server.ChannelTypeContactList.__init__(self, connection, h) except TypeError: - # Newer python-telepathy way + # HACK Newer python-telepathy way telepathy.server.ChannelTypeContactList.__init__(self, connection, manager, props) telepathy.server.ChannelInterfaceGroup.__init__(self) @@ -67,7 +67,7 @@ class AllContactsListChannel(AbstractListChannel): telepathy.server.ChannelTypeContactList.Close(self) if self._manager.channel_exists(self._props): - # Older python-telepathy requires doing this manually + # HACK Older python-telepathy requires doing this manually self._manager.remove_channel(self) self.remove_from_connection() diff --git a/src/channel/text.py b/src/channel/text.py index 31aa4e3..d2c5313 100644 --- a/src/channel/text.py +++ b/src/channel/text.py @@ -22,10 +22,10 @@ class TextChannel(telepathy.server.ChannelTypeText): self._props = props try: - # Older python-telepathy way + # HACK Older python-telepathy way telepathy.server.ChannelTypeText.__init__(self, connection, contactHandle) except TypeError: - # Newer python-telepathy way + # HACK Newer python-telepathy way telepathy.server.ChannelTypeText.__init__(self, connection, manager, props) self._nextRecievedId = 0 self._lastMessageTimestamp = datetime.datetime(1, 1, 1) @@ -72,7 +72,7 @@ class TextChannel(telepathy.server.ChannelTypeText): telepathy.server.ChannelTypeText.Close(self) if self._manager.channel_exists(self._props): - # Older python-telepathy requires doing this manually + # HACK Older python-telepathy requires doing this manually self._manager.remove_channel(self) self.remove_from_connection() diff --git a/src/channel_manager.py b/src/channel_manager.py index efcf16d..4f289dd 100644 --- a/src/channel_manager.py +++ b/src/channel_manager.py @@ -65,10 +65,10 @@ class TelepathyChannelManager(object): chan = self._requestable_channel_classes[type](props, **args) if hasattr(self._conn, "add_channels"): - # Newer python-telepathy + # HACK Newer python-telepathy self._conn.add_channels([chan], signal=signal) elif hasattr(self._conn, "add_channel"): - # Older python-telepathy + # HACK Older python-telepathy self._conn.add_channel(chan, handle, suppress_handler) else: raise RuntimeError("Uhh, what just happened with the connection") diff --git a/src/connection.py b/src/connection.py index 75c5a83..475f1aa 100644 --- a/src/connection.py +++ b/src/connection.py @@ -187,7 +187,7 @@ class TheOneRingConnection( h = self.handle(handleType, handleId) if handleId != 0 else None props = self._generate_props(type, h, suppressHandler) if hasattr(self, "_validate_handle"): - # On newer python-telepathy + # HACK Newer python-telepathy self._validate_handle(props) chan = self._channelManager.channel_for_props(props, signal=True) -- 1.7.9.5