[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: df6194f9346e3951692e5ec5e43bc9fe3f5716bc

[X2Go dev team]

The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
       via  df6194f9346e3951692e5ec5e43bc9fe3f5716bc (commit)
      from  438ea566bd710f84c3adfb50b0977e417f9742e6 (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-gui              |    3 ++-
 pyhoca/wxgui/taskbar.py |   10 +++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/pyhoca-gui b/pyhoca-gui
index a7248f3..b88cfe6 100755
--- a/pyhoca-gui
+++ b/pyhoca-gui
@@ -38,9 +38,10 @@ import sys
 import exceptions
 
 app = sys.argv[0]
-if app.startswith('./'):
+if app.startswith('./') or os.path.dirname(__file__).endswith('trunk'):
     sys.path.insert(0, os.path.join(os.path.dirname(__file__)))
     os.environ['PYHOCAGUI_DEVELOPMENT'] = '1'
+    print '### PyHoca-GUI running in development mode ###'
 
 # Python X2go modules
 import x2go
diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py
index 925d021..6aea2b1 100644
--- a/pyhoca/wxgui/taskbar.py
+++ b/pyhoca/wxgui/taskbar.py
@@ -48,10 +48,14 @@ import menus_taskbar
 import profilemanager
 
 if os.environ.has_key('PYHOCAGUI_DEVELOPMENT') and os.environ['PYHOCAGUI_DEVELOPMENT'] == '1':
-    _icons_location = '/%s/icons' % os.path.abspath(os.path.curdir)
+    _icons_location = os.path.join(os.path.abspath(os.path.curdir), 'icons')
 else:
-    _icons_location = '/usr/share/icons'
-
+    if x2go.X2GOCLIENT_OS == 'Windows':
+        _icons_location = os.path.join(os.environ('ProgramFiles'), 'PyHoca-GUI', 'icons')
+    elif x2go.X2GOCLIENT_OS == 'Mac':
+        _icons_location = os.path.join('do', 'not', 'know')
+    else:
+        _icons_location = '/usr/share/icons'
 
 try:
     from agw import knobctrl as KC


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)).