From 31d2bcbe7dea9a0b8e3ed5dbb637e9f848cab426 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Wed, 28 Oct 2009 11:11:55 +0100 Subject: [PATCH] remove the possibility to configure systray if module is not available. Fixes #5345 --- src/config.py | 2 ++ src/gajim.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/config.py b/src/config.py index bb30a60f3..3d999f689 100644 --- a/src/config.py +++ b/src/config.py @@ -314,6 +314,8 @@ 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/gajim.py b/src/gajim.py index 5eb571592..3dd191d37 100644 --- a/src/gajim.py +++ b/src/gajim.py @@ -3609,6 +3609,8 @@ class Interface: self.systray_capabilities = systray.HAS_SYSTRAY_CAPABILITIES if self.systray_capabilities: self.systray = systray.Systray() + else: + gajim.config.set('trayicon', 'never') path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'gajim.png') pix = gtk.gdk.pixbuf_new_from_file(path_to_file)