Commits

commits@gajim.org

17632 discussions

gajim: Make last message correction work correctly in PM. See #8220
by Gajim 05 Mar '16

05 Mar '16

changeset b82d1ee5532e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=b82d1ee5532e description: Make last message correction work correctly in PM. See #8220 diffstat: src/groupchat_control.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r affa5cad9540 -r b82d1ee5532e src/groupchat_control.py --- a/src/groupchat_control.py Sat Mar 05 15:24:25 2016 +0100 +++ b/src/groupchat_control.py Sat Feb 27 18:54:19 2016 +0100 @@ -1368,7 +1368,8 @@ # print if a control is open obj.session.control.print_conversation(obj.msgtxt, tim=obj.timestamp, xhtml=obj.xhtml, encrypted=obj.encrypted, - displaymarking=obj.displaymarking) + displaymarking=obj.displaymarking, correct_id=(obj.id_, + obj.correct_id)) else: # otherwise pass it off to the control to be queued self.on_private_message(nick, obj.msgtxt, obj.timestamp,

1 0

gajim: fix sending receipts. Fixes #7548
by Gajim 05 Mar '16

05 Mar '16

changeset c9fb0c33631e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c9fb0c33631e description: fix sending receipts. Fixes #7548 diffstat: src/common/connection_handlers.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r be3278309ee5 -r c9fb0c33631e src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Mar 05 14:22:56 2016 +0100 +++ b/src/common/connection_handlers.py Sat Mar 05 15:23:48 2016 +0100 @@ -1169,7 +1169,10 @@ contact = gajim.contacts.get_contact(self.name, obj.jid) nick = obj.resource gc_contact = gajim.contacts.get_gc_contact(self.name, obj.jid, nick) - jid_to = obj.stanza.getTo() + if obj.sent: + jid_to = obj.stanza.getFrom() + else: + jid_to = obj.stanza.getTo() reply = False if not jid_to: reply = True

1 0

gajim: get the id of the forwarded message correctly. Fixes #8258
by Gajim 05 Mar '16

05 Mar '16

changeset affa5cad9540 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=affa5cad9540 description: get the id of the forwarded message correctly. Fixes #8258 diffstat: src/common/connection_handlers_events.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (29 lines): diff -r 57ee64f223f4 -r affa5cad9540 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sat Mar 05 15:23:48 2016 +0100 +++ b/src/common/connection_handlers_events.py Sat Mar 05 15:24:25 2016 +0100 @@ -1151,6 +1151,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() @@ -1600,7 +1601,7 @@ class MessageSentEvent(nec.NetworkIncomingEvent): name = 'message-sent' base_network_events = [] - + def generate(self): if not self.automatic_message: self.conn.sent_message_ids.append(self.msg_id) @@ -1616,7 +1617,7 @@ class MessageErrorEvent(nec.NetworkIncomingEvent, HelperEvent): name = 'message-error' base_network_events = [] - + def generate(self): self.get_id() #only alert for errors of explicitly sent messages (see https://trac.gajim.org/ticket/8222)

1 0

gajim: fix sending receipts. Fixes #7548
by Gajim 05 Mar '16

05 Mar '16

changeset 57ee64f223f4 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=57ee64f223f4 description: fix sending receipts. Fixes #7548 diffstat: src/common/connection_handlers.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r af6f475add9e -r 57ee64f223f4 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Mar 05 15:10:58 2016 +0100 +++ b/src/common/connection_handlers.py Sat Mar 05 15:23:48 2016 +0100 @@ -1171,7 +1171,10 @@ contact = gajim.contacts.get_contact(self.name, obj.jid) nick = obj.resource gc_contact = gajim.contacts.get_gc_contact(self.name, obj.jid, nick) - jid_to = obj.stanza.getTo() + if obj.sent: + jid_to = obj.stanza.getFrom() + else: + jid_to = obj.stanza.getTo() reply = False if not jid_to: reply = True

1 0

gajim: don't use the same message id when replying to receipts. ...
by Gajim 05 Mar '16

05 Mar '16

changeset af6f475add9e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=af6f475add9e description: don't use the same message id when replying to receipts. See #8258 diffstat: src/common/connection_handlers.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 58023a4af19f -r af6f475add9e src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Feb 10 16:56:44 2016 +0100 +++ b/src/common/connection_handlers.py Sat Mar 05 15:10:58 2016 +0100 @@ -1185,7 +1185,6 @@ not in (u'to', u'none')) or gc_contact) and obj.mtype != 'error' and \ reply: receipt = nbxmpp.Message(to=obj.fjid, typ='chat') - receipt.setID(obj.id_) receipt.setTag('received', namespace='urn:xmpp:receipts', attrs={'id': obj.id_})

1 0

gajim: make last message correction work for carbon copied messa...
by Gajim 05 Mar '16

05 Mar '16

changeset be3278309ee5 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)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()

1 0

gajim: Make last message correction work correctly in PM. See #8220
by Gajim 29 Feb '16

29 Feb '16

changeset 9f7c62b5dbda in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=9f7c62b5dbda description: Make last message correction work correctly in PM. See #8220 diffstat: src/groupchat_control.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r de72c20ba060 -r 9f7c62b5dbda src/groupchat_control.py --- a/src/groupchat_control.py Sun Feb 21 16:45:31 2016 +0100 +++ b/src/groupchat_control.py Sat Feb 27 18:54:19 2016 +0100 @@ -1368,7 +1368,8 @@ # print if a control is open obj.session.control.print_conversation(obj.msgtxt, tim=obj.timestamp, xhtml=obj.xhtml, encrypted=obj.encrypted, - displaymarking=obj.displaymarking) + displaymarking=obj.displaymarking, correct_id=(obj.id_, + obj.correct_id)) else: # otherwise pass it off to the control to be queued self.on_private_message(nick, obj.msgtxt, obj.timestamp,

1 0

gajim: rename msg_id to msg_log_id where it's the id from logs d...
by Gajim 29 Feb '16

29 Feb '16

changeset 85fc8e1684ff in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=85fc8e1684ff description: rename msg_id to msg_log_id where it's the id from logs database diffstat: src/chat_control.py | 8 ++++---- src/common/connection_handlers_events.py | 6 +++--- src/common/contacts.py | 4 ++-- src/common/logger.py | 10 +++++----- src/groupchat_control.py | 6 +++--- src/roster_window.py | 20 ++++++++++---------- src/session.py | 18 +++++++++--------- 7 files changed, 36 insertions(+), 36 deletions(-) diffs (284 lines): diff -r 9f7c62b5dbda -r 85fc8e1684ff src/chat_control.py --- a/src/chat_control.py Sat Feb 27 18:54:19 2016 +0100 +++ b/src/chat_control.py Sat Feb 27 19:52:46 2016 +0100 @@ -849,7 +849,7 @@ def print_conversation_line(self, text, kind, name, tim, other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[], count_as_new=True, subject=None, old_kind=None, xhtml=None, simple=False, - xep0184_id=None, graphics=True, displaymarking=None, msg_id=None, + xep0184_id=None, graphics=True, displaymarking=None, msg_log_id=None, correct_id=None): """ Print 'chat' type messages @@ -925,7 +925,7 @@ self.account, self.contact, type_) event = gajim.events.create_event(type_, (text, subject, self, - msg_id), show_in_roster=show_in_roster, + msg_log_id), show_in_roster=show_in_roster, show_in_systray=show_in_systray) gajim.events.add_event(self.account, full_jid, event) # We need to redraw contact if we show in roster @@ -2448,7 +2448,7 @@ def print_conversation(self, text, frm='', tim=None, encrypted=False, subject=None, xhtml=None, simple=False, xep0184_id=None, - displaymarking=None, msg_id=None, correct_id=None): + displaymarking=None, msg_log_id=None, correct_id=None): """ Print a line in the conversation @@ -2513,7 +2513,7 @@ ChatControlBase.print_conversation_line(self, text, kind, name, tim, subject=subject, old_kind=self.old_msg_kind, xhtml=xhtml, simple=simple, xep0184_id=xep0184_id, displaymarking=displaymarking, - msg_id=msg_id, correct_id=correct_id) + msg_log_id=msg_log_id, correct_id=correct_id) if text.startswith('/me ') or text.startswith('/me\n'): self.old_msg_kind = None else: diff -r 9f7c62b5dbda -r 85fc8e1684ff src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sat Feb 27 18:54:19 2016 +0100 +++ b/src/common/connection_handlers_events.py Sat Feb 27 19:52:46 2016 +0100 @@ -1395,7 +1395,7 @@ self.sent = self.msg_obj.sent self.conn = self.msg_obj.conn self.popup = False - self.msg_id = None # id in log database + self.msg_log_id = None # id in log database self.attention = False # XEP-0224 self.correct_id = None # XEP-0308 self.msghash = None @@ -1600,7 +1600,7 @@ class MessageSentEvent(nec.NetworkIncomingEvent): name = 'message-sent' base_network_events = [] - + def generate(self): if not self.automatic_message: self.conn.sent_message_ids.append(self.msg_id) @@ -1616,7 +1616,7 @@ class MessageErrorEvent(nec.NetworkIncomingEvent, HelperEvent): name = 'message-error' base_network_events = [] - + def generate(self): self.get_id() #only alert for errors of explicitly sent messages (see https://trac.gajim.org/ticket/8222) diff -r 9f7c62b5dbda -r 85fc8e1684ff src/common/contacts.py --- a/src/common/contacts.py Sat Feb 27 18:54:19 2016 +0100 +++ b/src/common/contacts.py Sat Feb 27 19:52:46 2016 +0100 @@ -94,7 +94,7 @@ """ def __init__(self, jid, account, name='', groups=[], show='', status='', sub='', ask='', resource='', priority=0, keyID='', client_caps=None, - our_chatstate=None, chatstate=None, last_status_time=None, msg_id=None, + our_chatstate=None, chatstate=None, last_status_time=None, msg_log_id=None, last_activity_time=None): if not isinstance(jid, str): print('no str') @@ -110,7 +110,7 @@ self.priority = priority self.keyID = keyID - self.msg_id = msg_id + self.msg_log_id = msg_log_id self.last_status_time = last_status_time self.last_activity_time = last_activity_time diff -r 9f7c62b5dbda -r 85fc8e1684ff src/common/logger.py --- a/src/common/logger.py Sat Feb 27 18:54:19 2016 +0100 +++ b/src/common/logger.py Sat Feb 27 19:52:46 2016 +0100 @@ -448,12 +448,12 @@ sql = 'DELETE FROM unread_messages WHERE message_id IN (%s)' % ids self.simple_commit(sql) - def set_shown_unread_msgs(self, msg_id): + def set_shown_unread_msgs(self, msg_log_id): """ Mark unread message as shown un GUI """ sql = 'UPDATE unread_messages SET shown = 1 where message_id = %s' % \ - msg_id + msg_log_id self.simple_commit(sql) def reset_shown_unread_messages(self): @@ -475,7 +475,7 @@ except Exception: pass for message in results: - msg_id = message[0] + msg_log_id = message[0] shown = message[1] # here we get infos for that message, and related jid from jids table # do NOT change order of SELECTed things, unless you change function(s) @@ -485,12 +485,12 @@ jids.jid FROM logs, jids WHERE logs.log_line_id = %d AND logs.jid_id = jids.jid_id - ''' % msg_id + ''' % msg_log_id ) results = self.cur.fetchall() if len(results) == 0: # Log line is no more in logs table. remove it from unread_messages - self.set_read_messages([msg_id]) + self.set_read_messages([msg_log_id]) continue all_messages.append(results[0] + (shown,)) return all_messages diff -r 9f7c62b5dbda -r 85fc8e1684ff src/groupchat_control.py --- a/src/groupchat_control.py Sat Feb 27 18:54:19 2016 +0100 +++ b/src/groupchat_control.py Sat Feb 27 19:52:46 2016 +0100 @@ -1076,14 +1076,14 @@ correct_id=(obj.stanza.getID(), None)) obj.needs_highlight = self.needs_visual_notification(obj.msgtxt) - def on_private_message(self, nick, msg, tim, xhtml, session, msg_id=None, + def on_private_message(self, nick, msg, tim, xhtml, session, msg_log_id=None, encrypted=False, displaymarking=None): # Do we have a queue? fjid = self.room_jid + '/' + nick no_queue = len(gajim.events.get_events(self.account, fjid)) == 0 event = gajim.events.create_event('pm', (msg, '', 'incoming', tim, - encrypted, '', msg_id, xhtml, session, None, displaymarking, False)) + encrypted, '', msg_log_id, xhtml, session, None, displaymarking, False)) gajim.events.add_event(self.account, fjid, event) autopopup = gajim.config.get('autopopup') @@ -1373,7 +1373,7 @@ else: # otherwise pass it off to the control to be queued self.on_private_message(nick, obj.msgtxt, obj.timestamp, - obj.xhtml, self.session, msg_id=obj.msg_id, + obj.xhtml, self.session, msg_log_id=obj.msg_log_id, encrypted=obj.encrypted, displaymarking=obj.displaymarking) def _nec_ping_reply(self, obj): diff -r 9f7c62b5dbda -r 85fc8e1684ff src/roster_window.py --- a/src/roster_window.py Sat Feb 27 18:54:19 2016 +0100 +++ b/src/roster_window.py Sat Feb 27 19:52:46 2016 +0100 @@ -1860,7 +1860,7 @@ tim = time.localtime(float(result[2])) session.roster_message(jid, result[1], tim, msg_type='chat', - msg_id=result[0]) + msg_log_id=result[0]) gajim.logger.set_shown_unread_msgs(result[0]) elif (time.time() - result[2]) > 2592000: @@ -1961,16 +1961,16 @@ pending events """ - msg_ids = [] + msg_log_ids = [] for ev in event_list: if ev.type_ != 'printed_chat': continue if len(ev.parameters) > 3 and ev.parameters[3]: - # There is a msg_id - msg_ids.append(ev.parameters[3]) - - if msg_ids: - gajim.logger.set_read_messages(msg_ids) + # There is a msg_log_id + msg_log_ids.append(ev.parameters[3]) + + if msg_log_ids: + gajim.logger.set_read_messages(msg_log_ids) contact_list = ((event.jid.split('/')[0], event.account) for event in \ event_list) @@ -2766,14 +2766,14 @@ obj.session.control.print_conversation(obj.msgtxt, typ, tim=obj.timestamp, encrypted=obj.encrypted, subject=obj.subject, xhtml=obj.xhtml, displaymarking=obj.displaymarking, - msg_id=obj.msg_id, correct_id=(obj.id_, obj.correct_id), + msg_log_id=obj.msg_log_id, correct_id=(obj.id_, obj.correct_id), xep0184_id=xep0184_id) - if obj.msg_id: + if obj.msg_log_id: pw = obj.session.control.parent_win end = obj.session.control.was_at_the_end if not pw or (pw.get_active_control() and obj.session.control \ == pw.get_active_control() and pw.is_active() and end): - gajim.logger.set_read_messages([obj.msg_id]) + gajim.logger.set_read_messages([obj.msg_log_id]) elif obj.popup and obj.mtype == 'chat': contact = gajim.contacts.get_contact(obj.conn.name, obj.jid) obj.session.control = gajim.interface.new_chat(contact, diff -r 9f7c62b5dbda -r 85fc8e1684ff src/session.py --- a/src/session.py Sat Feb 27 18:54:19 2016 +0100 +++ b/src/session.py Sat Feb 27 19:52:46 2016 +0100 @@ -99,7 +99,7 @@ msg_to_log = obj.xhtml else: msg_to_log = obj.msgtxt - obj.msg_id = gajim.logger.write(log_type, obj.fjid, + obj.msg_log_id = gajim.logger.write(log_type, obj.fjid, msg_to_log, tim=obj.timestamp, subject=obj.subject) except exceptions.PysqliteOperationalError as e: gajim.nec.push_incoming_event(InformationEvent(None, @@ -142,8 +142,8 @@ # Brand new message, incoming. contact.our_chatstate = obj.chatstate contact.chatstate = obj.chatstate - if obj.msg_id: # Do not overwrite an existing msg_id with None - contact.msg_id = obj.msg_id + if obj.msg_log_id: # Do not overwrite an existing msg_log_id with None + contact.msg_log_id = obj.msg_log_id # THIS MUST BE AFTER chatstates handling # AND BEFORE playsound (else we ear sounding on chatstates!) @@ -182,7 +182,7 @@ gajim.interface.remote_ctrl.raise_signal('NewMessage', ( self.conn.name, [obj.fjid, obj.msgtxt, obj.timestamp, obj.encrypted, obj.mtype, obj.subject, obj.chatstate, - obj.msg_id, obj.user_nick, obj.xhtml, obj.form_node])) + obj.msg_log_id, obj.user_nick, obj.xhtml, obj.form_node])) def roster_message2(self, obj): """ @@ -255,7 +255,7 @@ (obj.mtype == 'normal' and not obj.popup): event = gajim.events.create_event(type_, (obj.msgtxt, obj.subject, obj.mtype, obj.timestamp, obj.encrypted, obj.resource, - obj.msg_id, obj.xhtml, self, obj.form_node, obj.displaymarking, + obj.msg_log_id, obj.xhtml, self, obj.form_node, obj.displaymarking, obj.forwarded and obj.sent), show_in_roster=obj.show_in_roster, show_in_systray=obj.show_in_systray) @@ -263,7 +263,7 @@ gajim.events.add_event(self.conn.name, fjid, event) def roster_message(self, jid, msg, tim, encrypted=False, msg_type='', - subject=None, resource='', msg_id=None, user_nick='', xhtml=None, + subject=None, resource='', msg_log_id=None, user_nick='', xhtml=None, form_node=None, displaymarking=None): """ Display the message or show notification in the roster @@ -332,8 +332,8 @@ self.control.print_conversation(msg, typ, tim=tim, encrypted=encrypted, subject=subject, xhtml=xhtml, displaymarking=displaymarking) - if msg_id: - gajim.logger.set_read_messages([msg_id]) + if msg_log_id: + gajim.logger.set_read_messages([msg_log_id]) return @@ -351,7 +351,7 @@ contact) event = gajim.events.create_event(type_, (msg, subject, msg_type, tim, - encrypted, resource, msg_id, xhtml, self, form_node, displaymarking, + encrypted, resource, msg_log_id, xhtml, self, form_node, displaymarking, False), show_in_roster=show_in_roster, show_in_systray=show_in_systray)

1 0

gajim: pending events are now in objects rather that storing par...
by Gajim 29 Feb '16

29 Feb '16

changeset 5c6c77423355 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=5c6c77423355 description: pending events are now in objects rather that storing parameters in tuple diffstat: src/chat_control.py | 85 +++++++++++++-------------- src/common/commands.py | 13 +-- src/common/events.py | 133 ++++++++++++++++++++++++++++++++++++++---- src/common/stanza_session.py | 4 +- src/filetransfers_window.py | 2 +- src/groupchat_control.py | 6 +- src/gui_interface.py | 71 ++++++++++++---------- src/roster_window.py | 41 ++++++------ src/session.py | 27 ++++--- 9 files changed, 247 insertions(+), 135 deletions(-) diffs (truncated from 819 to 300 lines): diff -r 85fc8e1684ff -r 5c6c77423355 src/chat_control.py --- a/src/chat_control.py Sat Feb 27 19:52:46 2016 +0100 +++ b/src/chat_control.py Mon Feb 29 21:04:08 2016 +0100 @@ -46,6 +46,7 @@ import notify import re +from common import events from common import gajim from common import helpers from common import exceptions @@ -912,20 +913,23 @@ # other_tags_for_text == ['marked'] --> highlighted gc message if gc_message: if 'marked' in other_tags_for_text: - type_ = 'printed_marked_gc_msg' + event_type = events.PrintedMarkedGcMsgEvent else: - type_ = 'printed_gc_msg' + event_type = events.PrintedGcMsgEvent event = 'gc_message_received' else: - type_ = 'printed_' + self.type_id + if self.type_id == message_control.TYPE_CHAT: + event_type = events.PrintedChatEvent + else: + event_type = events.PrintedPmEvent event = 'message_received' show_in_roster = notify.get_show_in_roster(event, self.account, self.contact, self.session) show_in_systray = notify.get_show_in_systray(event, - self.account, self.contact, type_) - - event = gajim.events.create_event(type_, (text, subject, self, - msg_log_id), show_in_roster=show_in_roster, + self.account, self.contact, event_type.type_) + + event = event_type(text, subject, self, msg_log_id, + show_in_roster=show_in_roster, show_in_systray=show_in_systray) gajim.events.add_event(self.account, full_jid, event) # We need to redraw contact if we show in roster @@ -2677,7 +2681,7 @@ gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, account=self.account, jid=self.contact.jid, chatstate=state, - msg_id=contact.msg_id, control=self)) + msg_id=contact.msg_log_id, control=self)) contact.our_chatstate = state if state == 'active': @@ -3010,23 +3014,20 @@ for event in events: if event.type_ != self.type_id: continue - data = event.parameters - kind = data[2] - if kind == 'error': + if event.kind == 'error': kind = 'info' else: kind = 'print_queue' - if data[11]: + if event.sent_forwarded: kind = 'out' - dm = data[10] - self.print_conversation(data[0], kind, tim=data[3], - encrypted=data[4], subject=data[1], xhtml=data[7], - displaymarking=dm) - if len(data) > 6 and isinstance(data[6], int): - message_ids.append(data[6]) - - if len(data) > 8 and not self.session: - self.set_session(data[8]) + self.print_conversation(event.message, kind, tim=event.time, + encrypted=event.encrypted, subject=event.subject, + xhtml=event.xhtml, displaymarking=event.displaymarking) + if isinstance(event.msg_log_id, int): + message_ids.append(event.msg_log_id) + + if event.session and not self.session: + self.set_session(event.session) if message_ids: gajim.logger.set_read_messages(message_ids) gajim.events.remove_events(self.account, jid_with_resource, @@ -3258,7 +3259,7 @@ def _get_file_props_event(self, file_props, type_): evs = gajim.events.get_events(self.account, self.contact.jid, [type_]) for ev in evs: - if ev.parameters == file_props: + if ev.file_props == file_props: return ev return None @@ -3322,15 +3323,13 @@ self._add_info_bar_message(markup, [b], file_props, Gtk.MessageType.ERROR) def _on_accept_gc_invitation(self, widget, event): - room_jid = event.parameters[0] - password = event.parameters[2] - is_continued = event.parameters[3] try: - if is_continued: - gajim.interface.join_gc_room(self.account, room_jid, - gajim.nicks[self.account], password, is_continued=True) + if event.is_continued: + gajim.interface.join_gc_room(self.account, event.room_jid, + gajim.nicks[self.account], event.password, + is_continued=True) else: - dialogs.JoinGroupchatWindow(self.account, room_jid) + dialogs.JoinGroupchatWindow(self.account, event.room_jid) except GajimGeneralException: pass gajim.events.remove_events(self.account, self.contact.jid, event=event) @@ -3339,17 +3338,15 @@ gajim.events.remove_events(self.account, self.contact.jid, event=event) def _get_gc_invitation(self, event): - room_jid = event.parameters[0] - comment = event.parameters[1] - markup = '<b>%s:</b> %s' % (_('Groupchat Invitation'), room_jid) - if comment: - markup += ' (%s)' % comment + markup = '<b>%s:</b> %s' % (_('Groupchat Invitation'), event.room_jid) + if event.comment: + markup += ' (%s)' % event.comment b1 = Gtk.Button(_('_Join')) b1.connect('clicked', self._on_accept_gc_invitation, event) b2 = Gtk.Button(stock=Gtk.STOCK_CANCEL) b2.connect('clicked', self._on_cancel_gc_invitation, event) - self._add_info_bar_message(markup, [b1, b2], event.parameters, - Gtk.MessageType.QUESTION) + self._add_info_bar_message(markup, [b1, b2], (event.room_jid, + event.comment), Gtk.MessageType.QUESTION) def on_event_added(self, event): if event.account != self.account: @@ -3357,19 +3354,19 @@ if event.jid != self.contact.jid: return if event.type_ == 'file-request': - self._got_file_request(event.parameters) + self._got_file_request(event.file_props) elif event.type_ == 'file-completed': - self._got_file_completed(event.parameters) + self._got_file_completed(event.file_props) elif event.type_ in ('file-error', 'file-stopped'): msg_err = '' - if event.parameters.error == -1: + if event.file_props.error == -1: msg_err = _('Remote contact stopped transfer') - elif event.parameters.error == -6: + elif event.file_props.error == -6: msg_err = _('Error opening file') - self._got_file_error(event.parameters, event.type_, + self._got_file_error(event.file_props, event.type_, _('File transfer stopped'), msg_err) elif event.type_ in ('file-request-error', 'file-send-error'): - self._got_file_error(event.parameters, event.type_, + self._got_file_error(event.file_props, event.type_, _('File transfer cancelled'), _('Connection with peer cannot be established.')) elif event.type_ == 'gc-invitation': @@ -3392,11 +3389,11 @@ removed = False for ib_msg in self.info_bar_queue: if ev.type_ == 'gc-invitation': - if ev.parameters[0] == ib_msg[2][0]: + if ev.room_jid == ib_msg[2][0]: self.info_bar_queue.remove(ib_msg) removed = True else: # file-* - if ib_msg[2] == ev.parameters: + if ib_msg[2] == ev.file_props: self.info_bar_queue.remove(ib_msg) removed = True if removed: diff -r 85fc8e1684ff -r 5c6c77423355 src/common/commands.py --- a/src/common/commands.py Sat Feb 27 19:52:46 2016 +0100 +++ b/src/common/commands.py Mon Feb 29 21:04:08 2016 +0100 @@ -287,9 +287,9 @@ if ev_typ == 'printed_chat': ev_typ = 'chat' gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, - account=account, jid=j, message=event.parameters[0], - type_=ev_typ, subject=event.parameters[1], - resource=resource, forward_from=jid, delayed=event.time_)) + account=account, jid=j, message=event.message, type_=ev_typ, + subject=event.subject, resource=resource, forward_from=jid, + delayed=event.time_)) # Inform other client of completion response, cmd = self.buildResponse(request, status = 'completed') @@ -321,10 +321,9 @@ if ev_typ == 'printed_chat': ev_typ = 'chat' gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, - account=account, jid=j, message=event.parameters[0], - type_=ev_typ, subject=event.parameters[1], - resource=resource, forward_from=jid, delayed=event.time_, - now=True)) + account=account, jid=j, message=event.message, type_=ev_typ, + subject=event.subject, resource=resource, forward_from=jid, + delayed=event.time_, now=True)) response, cmd = self.buildResponse(request, status = 'completed') cmd.addChild('note', {}, _('The status has been changed.')) diff -r 85fc8e1684ff -r 5c6c77423355 src/common/events.py --- a/src/common/events.py Sat Feb 27 19:52:46 2016 +0100 +++ b/src/common/events.py Mon Feb 29 21:04:08 2016 +0100 @@ -31,8 +31,7 @@ Information concerning each event """ - def __init__(self, type_, time_, parameters, show_in_roster=False, - show_in_systray=True): + def __init__(self, time_=None, show_in_roster=False, show_in_systray=True): """ type_ in chat, normal, file-request, file-error, file-completed, file-request-error, file-send-error, file-stopped, gc_msg, pm, @@ -41,27 +40,138 @@ parameters is (per type_): chat, normal, pm: [message, subject, kind, time, encrypted, resource, - msg_id] + msg_log_id] where kind in error, incoming file-*: file_props gc_msg: None - printed_chat: [message, subject, control, msg_id] + printed_chat: [message, subject, control, msg_log_id] printed_*: None messages that are already printed in chat, but not read - gc-invitation: [room_jid, reason, password, is_continued] + gc-invitation: [room_jid, reason, password, is_continued, jid_from] subscription_request: [text, nick] unsubscribed: contact jingle-incoming: (fulljid, sessionid, content_types) """ - self.type_ = type_ - self.time_ = time_ - self.parameters = parameters + if time_: + self.time_ = time_ + else: + self.time_ = time.time() self.show_in_roster = show_in_roster self.show_in_systray = show_in_systray # Set when adding the event self.jid = None self.account = None +class ChatEvent(Event): + type_ = 'chat' + def __init__ (self, message, subject, kind, time, encrypted, resource, + msg_log_id=None, xhtml=None, session=None, form_node=None, displaymarking=None, + sent_forwarded=False, time_=None, show_in_roster=False, + show_in_systray=True): + Event.__init__(self, time_, show_in_roster=show_in_roster, + show_in_systray=show_in_systray) + self.message = message + self.subject = subject + self.kind = kind + self.time = time + self.encrypted = encrypted + self.resource = resource + self.msg_log_id = msg_log_id + self.xhtml = xhtml + self.session = session + self.form_node = form_node + self.displaymarking = displaymarking + self.sent_forwarded = sent_forwarded + +class NormalEvent(ChatEvent): + type_ = 'normal' + +class PmEvent(ChatEvent): + type_ = 'pm' + +class PrintedChatEvent(Event): + type_ = 'printed_chat' + def __init__(self, message, subject, control, msg_log_id, time_=None, + show_in_roster=False, show_in_systray=True): + Event.__init__(self, time_, show_in_roster=show_in_roster, + show_in_systray=show_in_systray) + self.message = message + self.subject = subject + self.control = control + self.msg_log_id = msg_log_id + +class PrintedGcMsgEvent(PrintedChatEvent): + type_ = 'printed_gc_msg' + +class PrintedMarkedGcMsgEvent(PrintedChatEvent): + type_ = 'printed_marked_gc_msg' + +class PrintedPmEvent(PrintedChatEvent): + type_ = 'printed_pm' +

1 0

gajim: handle message correction correctly even if we don't prin...
by Gajim 29 Feb '16

29 Feb '16

changeset ad4236d5a427 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=ad4236d5a427 description: handle message correction correctly even if we don't print the message instantly in a chat window. Fixes #8220 diffstat: src/chat_control.py | 5 +++-- src/common/events.py | 5 +++-- src/session.py | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diffs (57 lines): diff -r 5c6c77423355 -r ad4236d5a427 src/chat_control.py --- a/src/chat_control.py Mon Feb 29 21:04:08 2016 +0100 +++ b/src/chat_control.py Mon Feb 29 21:29:20 2016 +0100 @@ -881,7 +881,7 @@ if not count_as_new: return - if kind in ('incoming', 'outgoing'): + if kind in ('incoming', 'incoming_queue', 'outgoing'): self.last_received_txt[name] = text if correct_id: self.last_received_id[name] = correct_id[0] @@ -3022,7 +3022,8 @@ kind = 'out' self.print_conversation(event.message, kind, tim=event.time, encrypted=event.encrypted, subject=event.subject, - xhtml=event.xhtml, displaymarking=event.displaymarking) + xhtml=event.xhtml, displaymarking=event.displaymarking, + correct_id=event.correct_id) if isinstance(event.msg_log_id, int): message_ids.append(event.msg_log_id) diff -r 5c6c77423355 -r ad4236d5a427 src/common/events.py --- a/src/common/events.py Mon Feb 29 21:04:08 2016 +0100 +++ b/src/common/events.py Mon Feb 29 21:29:20 2016 +0100 @@ -65,8 +65,8 @@ class ChatEvent(Event): type_ = 'chat' def __init__ (self, message, subject, kind, time, encrypted, resource, - msg_log_id=None, xhtml=None, session=None, form_node=None, displaymarking=None, - sent_forwarded=False, time_=None, show_in_roster=False, + msg_log_id, correct_id=None, xhtml=None, session=None, form_node=None, + displaymarking=None, sent_forwarded=False, time_=None, show_in_roster=False, show_in_systray=True): Event.__init__(self, time_, show_in_roster=show_in_roster, show_in_systray=show_in_systray) @@ -77,6 +77,7 @@ self.encrypted = encrypted self.resource = resource self.msg_log_id = msg_log_id + self.correct_id = correct_id self.xhtml = xhtml self.session = session self.form_node = form_node diff -r 5c6c77423355 -r ad4236d5a427 src/session.py --- a/src/session.py Mon Feb 29 21:04:08 2016 +0100 +++ b/src/session.py Mon Feb 29 21:29:20 2016 +0100 @@ -255,7 +255,8 @@ if (not self.control and obj.mtype != 'normal') or \ (obj.mtype == 'normal' and not obj.popup): event = event_t(obj.msgtxt, obj.subject, obj.mtype, obj.timestamp, - obj.encrypted, obj.resource, obj.msg_log_id, xhtml=obj.xhtml, + obj.encrypted, obj.resource, obj.msg_log_id, + correct_id=(obj.id_, obj.correct_id), xhtml=obj.xhtml, session=self, form_node=obj.form_node, displaymarking=obj.displaymarking, sent_forwarded=obj.forwarded and obj.sent,

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits