Author: asterix Date: 2008-02-27 19:25:42 +0100 (Wed, 27 Feb 2008) New Revision: 9343

Modified: trunk/src/chat_control.py Log: don't always show events in systray when notify_on_all_muc_messages is on and trayicon_notification_on_event is off

Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-02-27 16:12:09 UTC (rev 9342) +++ trunk/src/chat_control.py 2008-02-27 18:25:42 UTC (rev 9343) @@ -676,19 +676,16 @@ # 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)