From 87a2ff3d69b6354a04f3e90344befba0e34b2c47 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Fri, 15 Sep 2006 23:06:40 +0000 Subject: [PATCH] show by default all events in roster --- src/notify.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/notify.py b/src/notify.py index 908ff25d9..1a6d32bbc 100644 --- a/src/notify.py +++ b/src/notify.py @@ -42,11 +42,9 @@ def get_show_in_roster(event, account, contact): return False if event == 'message_received': chat_control = helpers.get_chat_control(account, contact) - if not chat_control: - return True - elif event == 'ft_request': - return True - return False + if chat_control: + return False + return True def get_show_in_systray(event, account, contact): '''Return True if this event must be shown in roster, else False''' @@ -56,10 +54,7 @@ def get_show_in_systray(event, account, contact): return True if gajim.config.get_per('notifications', str(num), 'systray') == 'no': return False - if event in ('message_received', 'ft_request', 'gc_msg_highlight', - 'ft_request'): - return True - return False + return True def get_advanced_notification(event, account, contact): '''Returns the number of the first advanced notification or None'''