From 39dc648ec81933867520d2584c6174b1b0f209aa Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Tue, 24 Nov 2009 15:42:31 +0100 Subject: [PATCH] don't use removed variables --- src/config.py | 2 -- src/roster_window.py | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/config.py b/src/config.py index a8e3b0902..d8ad836f7 100644 --- a/src/config.py +++ b/src/config.py @@ -297,8 +297,6 @@ class PreferencesWindow: systray_combobox.set_active(1) else: systray_combobox.set_active(2) - if not gajim.interface.systray_capabilities: - systray_combobox.set_sensitive(False) # sounds if gajim.config.get('sounds_on'): diff --git a/src/roster_window.py b/src/roster_window.py index 900d973c4..344c4574a 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -5809,10 +5809,8 @@ class RosterWindow: if gajim.config.get('show_roster_on_startup'): self.window.show_all() else: - if not gajim.config.get('trayicon') or not \ - gajim.interface.systray_capabilities: - # cannot happen via GUI, but I put this incase user touches - # config. without trayicon, he or she should see the roster! + if gajim.config.get('trayicon') != 'always': + # Without trayicon, user should see the roster! self.window.show_all() gajim.config.set('show_roster_on_startup', True)