Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim

Commits: 59b3b3ae by Yann Leboulanger at 2017-08-13T23:05:25+02:00 do not create Event when we auto popup a normal message. Fixes #8645

- - - - -

1 changed file:

- src/session.py

Changes:

===================================== src/session.py ===================================== --- a/src/session.py +++ b/src/session.py @@ -247,18 +247,24 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): # We have a ChatControl open obj.show_in_roster = False obj.show_in_systray = False + do_event = False elif obj.forwarded and obj.sent: # Its a Carbon Copied Message we sent obj.show_in_roster = False obj.show_in_systray = False gajim.events.remove_events(self.conn.name, fjid, types=['chat']) + do_event = False else: # Everything else obj.show_in_roster = notify.get_show_in_roster(event_type, self.conn.name, contact, self) obj.show_in_systray = notify.get_show_in_systray(event_type, self.conn.name, contact) - + if obj.mtype == 'normal' and not obj.popup: + do_event = False + else: + do_event = True + if do_event: event = event_t(obj.msgtxt, obj.subject, obj.mtype, obj.timestamp, obj.encrypted, obj.resource, obj.msg_log_id, correct_id=(obj.id_, obj.correct_id), xhtml=obj.xhtml,

View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/59b3b3aed94ad143a16261a9f8e171c41cb...

--- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/59b3b3aed94ad143a16261a9f8e171c41cb... You're receiving this email because of your account on dev.gajim.org.