projects
/
theonering
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing a deprecation warning and some bugs
[theonering]
/
src
/
channel
/
text.py
diff --git
a/src/channel/text.py
b/src/channel/text.py
index
8fe4a5f
..
e882bfd
100644
(file)
--- a/
src/channel/text.py
+++ b/
src/channel/text.py
@@
-9,9
+9,8
@@
class TextChannel(telepathy.server.ChannelTypeText):
Look into implementing ChannelInterfaceMessages for rich text formatting
"""
Look into implementing ChannelInterfaceMessages for rich text formatting
"""
- def __init__(self, connection, conversation):
+ def __init__(self, connection):
self._recv_id = 0
self._recv_id = 0
- self._conversation = conversation
self._connRef = weakref.ref(connection)
telepathy.server.ChannelTypeText.__init__(self, connection, None)
self._connRef = weakref.ref(connection)
telepathy.server.ChannelTypeText.__init__(self, connection, None)
@@
-21,9
+20,7
@@
class TextChannel(telepathy.server.ChannelTypeText):
def Send(self, messageType, text):
if messageType == telepathy.CHANNEL_TEXT_MESSAGE_TYPE_NORMAL:
def Send(self, messageType, text):
if messageType == telepathy.CHANNEL_TEXT_MESSAGE_TYPE_NORMAL:
- self._conversation.send_text_message(text)
- elif messageType == telepathy.CHANNEL_TEXT_MESSAGE_TYPE_ACTION and text == u"nudge":
- self._conversation.send_nudge()
+ pass
else:
raise telepathy.NotImplemented("Unhandled message type")
self.Sent(int(time.time()), messageType, text)
else:
raise telepathy.NotImplemented("Unhandled message type")
self.Sent(int(time.time()), messageType, text)