changeset afabad06b732 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=afabad06b732 description: don't use removed variables
diffstat:
src/config.py | 2 -- src/roster_window.py | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-)
diffs (28 lines):
diff -r a8aa9c29f1fe -r afabad06b732 src/config.py --- a/src/config.py Tue Nov 24 15:41:16 2009 +0100 +++ b/src/config.py Tue Nov 24 15:42:31 2009 +0100 @@ -297,8 +297,6 @@ 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 -r a8aa9c29f1fe -r afabad06b732 src/roster_window.py --- a/src/roster_window.py Tue Nov 24 15:41:16 2009 +0100 +++ b/src/roster_window.py Tue Nov 24 15:42:31 2009 +0100 @@ -5809,10 +5809,8 @@ 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)