summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Pasquet <mathieui@mathieui.net>2013-10-06 22:45:38 +0200
committerMathieu Pasquet <mathieui@mathieui.net>2013-10-06 22:45:38 +0200
commitdd4f8661a969233267c4ca30bf4f204dcb03e230 (patch)
tree2dee9eb1220a5df287d3020997f91ab4a1efc3f0
parent0124ac1b0624a59fe00ee29653c2aa5e1521895d (diff)
downloadpoezio-dd4f8661a969233267c4ca30bf4f204dcb03e230.tar.gz
poezio-dd4f8661a969233267c4ca30bf4f204dcb03e230.tar.bz2
poezio-dd4f8661a969233267c4ca30bf4f204dcb03e230.tar.xz
poezio-dd4f8661a969233267c4ca30bf4f204dcb03e230.zip
Fix #2358 (/correct is broken in private conversations)
-rw-r--r--src/text_buffer.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/text_buffer.py b/src/text_buffer.py
index 40b275b1..2254fa62 100644
--- a/src/text_buffer.py
+++ b/src/text_buffer.py
@@ -116,9 +116,9 @@ class TextBuffer(object):
raise CorrectionError("Delayed message")
elif not msg.user and (msg.jid is None or jid is None):
raise CorrectionError('Could not check the identity of the sender')
- elif not msg.user and msg.jid.full != jid.full:
+ elif not msg.user and msg.jid != jid:
raise CorrectionError('Messages %s and %s have not been sent by the same fullJID' % (old_id, new_id))
- message = self.make_message(txt, time if time else msg.time, msg.nickname, msg.nick_color, None, msg.user, new_id, highlight=highlight, old_message=msg, revisions=msg.revisions + 1)
+ message = self.make_message(txt, time if time else msg.time, msg.nickname, msg.nick_color, None, msg.user, new_id, highlight=highlight, old_message=msg, revisions=msg.revisions + 1, jid=jid)
self.messages[i] = message
log.debug('Replacing message %s with %s.', old_id, new_id)
return message