From b5c19e0884228a0cb59f40c3286d46809c49a0ac Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Wed, 27 Feb 2008 18:25:42 +0000 Subject: [PATCH] don't always show events in systray when notify_on_all_muc_messages is on and trayicon_notification_on_event is off --- src/chat_control.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/chat_control.py b/src/chat_control.py index 93aa14845..72119379e 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -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)