copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix accidental commit

This commit is contained in:
Nikos Kouremenos 2006-08-27 15:42:36 +00:00
parent 63a1b93a58
commit 7abacab6a4
3 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/gajim.py
View File

@ -1884,23 +1884,18 @@ class Interface:
self.systray_enabled = False self.systray_enabled = False
self.systray_capabilities = False self.systray_capabilities = False
if gtk.pygtk_version >= (2, 10, 0) and gtk.gtk_version >= (2, 10, 0): if os.name == 'nt':
import statusicon try:
self.systray = statusicon.StatusIcon() import systraywin32
self.systray_capabilities = True except: # user doesn't have trayicon capabilities
else: #FIXME: remove the following (and the files) when we migrate to 2.10 pass
if os.name == 'nt':
try:
import systraywin32
except: # user doesn't have trayicon capabilities
pass
else:
self.systray_capabilities = True
self.systray = systraywin32.SystrayWin32()
else: else:
self.systray_capabilities = systray.HAS_SYSTRAY_CAPABILITIES self.systray_capabilities = True
if self.systray_capabilities: self.systray = systraywin32.SystrayWin32()
self.systray = systray.Systray() else:
self.systray_capabilities = systray.HAS_SYSTRAY_CAPABILITIES
if self.systray_capabilities:
self.systray = systray.Systray()
if self.systray_capabilities and gajim.config.get('trayicon'): if self.systray_capabilities and gajim.config.get('trayicon'):
self.show_systray() self.show_systray()

9
src/roster_window.py
View File

@ -655,11 +655,14 @@ class RosterWindow:
def on_history_manager_menuitem_activate(self, widget): def on_history_manager_menuitem_activate(self, widget):
if os.name == 'nt': if os.name == 'nt':
if os.path.exists('history_manager.exe'): # user is running stable if os.path.exists('history_manager.exe'): # user is running stable
helpers.exec_command('history_manager.exe') os.startfile('history_manager.exe')
else: # user is running svn else: # user is running svn
helpers.exec_command('history_manager.py') try:
os.startfile('history_manager.py')
except: # user doesn't have pywin32, too bad for him
pass
else: # Unix user else: # Unix user
helpers.exec_command('python history_manager.py &') os.system('python history_manager.py &')
def get_and_connect_advanced_menuitem_menu(self, account): def get_and_connect_advanced_menuitem_menu(self, account):
'''adds FOR ACCOUNT options''' '''adds FOR ACCOUNT options'''

4
src/systray.py
View File

@ -2,7 +2,7 @@
## ##
## Copyright (C) 2003-2006 Yann Le Boulanger <asterix@lagaule.org> ## Copyright (C) 2003-2006 Yann Le Boulanger <asterix@lagaule.org>
## Copyright (C) 2003-2004 Vincent Hanquez <tab@snarc.org> ## Copyright (C) 2003-2004 Vincent Hanquez <tab@snarc.org>
## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com> ## Copyright (C) 2005-2006 Nikos Kouremenos <nkour@jabber.org>
## Copyright (C) 2005 Dimitur Kirov <dkirov@gmail.com> ## Copyright (C) 2005 Dimitur Kirov <dkirov@gmail.com>
## Copyright (C) 2005-2006 Travis Shirk <travis@pobox.com> ## Copyright (C) 2005-2006 Travis Shirk <travis@pobox.com>
## Copyright (C) 2005 Norman Rasmussen <norman@rasmussen.co.za> ## Copyright (C) 2005 Norman Rasmussen <norman@rasmussen.co.za>
@ -77,7 +77,7 @@ class Systray:
def add_jid(self, jid, account, typ, advanced_notif_num = None): def add_jid(self, jid, account, typ, advanced_notif_num = None):
l = [account, jid, typ] l = [account, jid, typ]
# We can keep several single message because we open them one by one # We can keep several single message 'cause we open them one by one
if not l in self.jids or typ == 'normal': if not l in self.jids or typ == 'normal':
self.jids.append(l) self.jids.append(l)
self.set_img(advanced_notif_num) self.set_img(advanced_notif_num)