[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 7ecb6c5befc25ed1a1d22046ea63f37e89f5032f
X2Go dev team
git-admin at x2go.org
Sat Sep 14 15:54:13 CEST 2013
The branch, twofactorauth has been updated
via 7ecb6c5befc25ed1a1d22046ea63f37e89f5032f (commit)
from 2ab7ddf42913b5abb4e8ed11401d4abe30bece3d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
pyhoca/wxgui/notify.py | 4 +++-
pyhoca/wxgui/taskbar.py | 5 ++++-
2 files changed, 7 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py
index f8eb545..eb60a3d 100644
--- a/pyhoca/wxgui/notify.py
+++ b/pyhoca/wxgui/notify.py
@@ -20,7 +20,9 @@
import wx, time, webbrowser
import images
-import pynotify
+from x2go import X2GOCLIENT_OS
+if X2GOCLIENT_OS in ('Linux', 'Mac'):
+ import pynotify
import exceptions
class NotSupportedException(exceptions.StandardError): pass
diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py
index 20dad7f..7896dc9 100644
--- a/pyhoca/wxgui/taskbar.py
+++ b/pyhoca/wxgui/taskbar.py
@@ -36,6 +36,9 @@ import wx
import wx.lib.scrolledpanel as scrolled
import wx.lib.mixins.listctrl as listmix
+if x2go.X2GOCLIENT_OS == 'Windows':
+ import win32gui
+
import time
import sys
import platform
@@ -125,7 +128,7 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon):
@param msec - Timeout for balloon tooltip, in milliseconds
@param flags - one of wx.ICON_INFORMATION, wx.ICON_WARNING, wx.ICON_ERROR
"""
- if WIN32 and self.IsIconInstalled():
+ if x2go.X2GOCLIENT_OS == 'Windows' and self.IsIconInstalled():
try:
self.__SetBalloonTip(self.icon.GetHandle(), title, text, msec, flags)
except Exception, e:
hooks/post-receive
--
pyhoca-gui.git (Python X2Go Client (wxPython GUI))
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).
More information about the x2go-commits
mailing list