don't always show events in systray when notify_on_all_muc_messages is on and trayicon_notification_on_event is off
This commit is contained in:
parent
c6660b875f
commit
b5c19e0884
|
@ -676,19 +676,16 @@ class ChatControlBase(MessageControl):
|
|||
# other_tags_for_text == ['marked'] --> highlighted gc message
|
||||
type_ = 'printed_' + self.type_id
|
||||
event = 'message_received'
|
||||
if gc_message:
|
||||
if other_tags_for_text == ['marked']:
|
||||
type_ = 'printed_marked_gc_msg'
|
||||
else:
|
||||
type_ = 'printed_gc_msg'
|
||||
event = 'gc_message_received'
|
||||
show_in_roster = notify.get_show_in_roster(event,
|
||||
self.account, self.contact)
|
||||
show_in_systray = notify.get_show_in_systray(event,
|
||||
self.account, self.contact)
|
||||
if gc_message:
|
||||
type_ = 'printed_gc_msg'
|
||||
event = 'gc_message_received'
|
||||
show_in_roster = True
|
||||
show_in_systray = False
|
||||
if gajim.config.get('notify_on_all_muc_messages'):
|
||||
show_in_systray = True
|
||||
if other_tags_for_text == ['marked']:
|
||||
type_ = 'printed_marked_gc_msg'
|
||||
event = gajim.events.create_event(type_, None,
|
||||
show_in_roster = show_in_roster,
|
||||
show_in_systray = show_in_systray)
|
||||
|
|
Loading…
Reference in New Issue