changeset be3278309ee5 in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=be3278309ee5 description: make last message correction work for carbon copied messages sent from another resource. Fixes #8276

diffstat:

src/chat_control.py | 7 +++++++ src/common/connection_handlers_events.py | 1 + 2 files changed, 8 insertions(+), 0 deletions(-)

diffs (28 lines):

diff -r ad4236d5a427 -r be3278309ee5 src/chat_control.py --- a/src/chat_control.py Mon Feb 29 21:29:20 2016 +0100 +++ b/src/chat_control.py Sat Mar 05 14:22:56 2016 +0100 @@ -870,6 +870,13 @@ correct_id[1] == self.last_received_id[name]: self.conv_textview.correct_last_received_message(text, xhtml, name, old_txt) + elif correct_id and correct_id[1] and \ + self.conv_textview.last_sent_message_marks[0] and \ + correct_id[1] == self.last_received_id[name]: + # this is for carbon copied messages that are sent from another + # resource + self.conv_textview.correct_last_sent_message(text, xhtml, + self.get_our_nick(), old_txt) else: textview.print_conversation_line(text, jid, kind, name, tim, other_tags_for_name, other_tags_for_time, other_tags_for_text, diff -r ad4236d5a427 -r be3278309ee5 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Feb 29 21:29:20 2016 +0100 +++ b/src/common/connection_handlers_events.py Sat Mar 05 14:22:56 2016 +0100 @@ -1150,6 +1150,7 @@ if forward_tag: msg = forward_tag.getTag('message') self.stanza = nbxmpp.Message(node=msg) + self.get_id() if carbon_marker.getName() == 'sent': to = self.stanza.getTo() frm = self.stanza.getFrom()