copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

do not create Event when we auto popup a normal message. Fixes #8645

This commit is contained in:
Yann Leboulanger 2017-08-13 23:03:11 +02:00
parent 0244ac4475
commit 9b866fd1a0
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gajim/session.py
View File

@ -242,18 +242,24 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
# We have a ChatControl open # We have a ChatControl open
obj.show_in_roster = False obj.show_in_roster = False
obj.show_in_systray = False obj.show_in_systray = False
do_event = False
elif obj.forwarded and obj.sent: elif obj.forwarded and obj.sent:
# Its a Carbon Copied Message we sent # Its a Carbon Copied Message we sent
obj.show_in_roster = False obj.show_in_roster = False
obj.show_in_systray = False obj.show_in_systray = False
gajim.events.remove_events(self.conn.name, fjid, types=['chat']) gajim.events.remove_events(self.conn.name, fjid, types=['chat'])
do_event = False
else: else:
# Everything else # Everything else
obj.show_in_roster = notify.get_show_in_roster(event_type, obj.show_in_roster = notify.get_show_in_roster(event_type,
self.conn.name, contact, self) self.conn.name, contact, self)
obj.show_in_systray = notify.get_show_in_systray(event_type, obj.show_in_systray = notify.get_show_in_systray(event_type,
self.conn.name, contact) 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, event = event_t(obj.msgtxt, obj.subject, obj.mtype, obj.timestamp,
obj.encrypted, obj.resource, obj.msg_log_id, obj.encrypted, obj.resource, obj.msg_log_id,
correct_id=(obj.id_, obj.correct_id), xhtml=obj.xhtml, correct_id=(obj.id_, obj.correct_id), xhtml=obj.xhtml,