diff options
| author | Yann Leboulanger <asterix@lagaule.org> | 2009-11-24 16:33:49 +0300 |
|---|---|---|
| committer | Yann Leboulanger <asterix@lagaule.org> | 2009-11-24 16:33:49 +0300 |
| commit | eb11c24eea6b367d1774cfa8ae3b38c03e72085a (patch) | |
| tree | a109da606e2794cdbd33f5792506ccb669f7af44 /src/gui_interface.py | |
| parent | 94f6d6b79ac357c98ec6d3089f891ec5d78968e4 (diff) | |
egg.trayicon is dead. Light a candle :'(
Fixes #3021, #5246
Diffstat (limited to 'src/gui_interface.py')
| -rw-r--r-- | src/gui_interface.py | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/gui_interface.py b/src/gui_interface.py index 98c1f3298..dc8959f91 100644 --- a/src/gui_interface.py +++ b/src/gui_interface.py @@ -3122,7 +3122,7 @@ class Interface: gajim.ipython_window = window def run(self): - if self.systray_capabilities and gajim.config.get('trayicon') != 'never': + if gajim.config.get('trayicon') != 'never': self.show_systray() self.roster = roster_window.RosterWindow() @@ -3357,21 +3357,9 @@ class Interface: gtkgui_helpers.make_jabber_state_images() self.systray_enabled = False - self.systray_capabilities = False - - if (os.name == 'nt'): - import statusicon - self.systray = statusicon.StatusIcon() - self.systray_capabilities = True - else: # use ours, not GTK+ one - # [FIXME: remove this when we migrate to 2.10 and we can do - # cool tooltips somehow and (not dying to keep) animation] - import systray - self.systray_capabilities = systray.HAS_SYSTRAY_CAPABILITIES - if self.systray_capabilities: - self.systray = systray.Systray() - else: - gajim.config.set('trayicon', 'never') + + import statusicon + self.systray = statusicon.StatusIcon() path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'gajim.png') pix = gtk.gdk.pixbuf_new_from_file(path_to_file) |