From b3f3a812a91f7533956fec1c3de5419f8d4dd2e5 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Wed, 27 Feb 2008 21:33:50 +0000 Subject: [PATCH] don't always show events in systray when notify_on_all_muc_mesages is False --- src/chat_control.py | 2 +- src/notify.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/chat_control.py b/src/chat_control.py index 72119379e..68ed40185 100644 --- a/src/chat_control.py +++ b/src/chat_control.py @@ -685,7 +685,7 @@ class ChatControlBase(MessageControl): 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) + self.account, self.contact, type_) event = gajim.events.create_event(type_, None, show_in_roster = show_in_roster, show_in_systray = show_in_systray) diff --git a/src/notify.py b/src/notify.py index 715ea063c..6d6a3f599 100644 --- a/src/notify.py +++ b/src/notify.py @@ -70,7 +70,7 @@ def get_show_in_roster(event, account, contact): return False return True -def get_show_in_systray(event, account, contact): +def get_show_in_systray(event, account, contact, type_=None): '''Return True if this event must be shown in systray, else False''' num = get_advanced_notification(event, account, contact) if num != None: @@ -78,6 +78,10 @@ def get_show_in_systray(event, account, contact): return True if gajim.config.get_per('notifications', str(num), 'systray') == 'no': return False + if type_ == 'printed_gc_msg' and not gajim.config.get( + 'notify_on_all_muc_messages'): + # it's not an highlighted message, don't show in systray + return False return gajim.config.get('trayicon_notification_on_events') def get_advanced_notification(event, account, contact):