[X2Go-Commits] [pyhoca-gui] 03/03: Fix check_running() method in PyHocaGUI_Launcher on MS Windows.

git-admin at x2go.org git-admin at x2go.org
Tue Apr 15 08:00:13 CEST 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch cvix/2.x
in repository pyhoca-gui.

commit b5380c08973d7d15ac4c4a5238d81b0cf2ed080f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Apr 15 07:55:19 2014 +0200

    Fix check_running() method in PyHocaGUI_Launcher on MS Windows.
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog
    	pyhoca/wxgui/launcher.py
---
 debian/changelog         |   47 +++++++++++++++++++++++-----------------------
 pyhoca/wxgui/launcher.py |    3 ++-
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b500558..01fbed6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,28 +1,29 @@
 pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low
 
-  * Adapt to new backend concept found in Python X2Go (>= 0.5.0.0).
-  * Move most code of the pyhoca-gui executable into a dedicated class
-    named PyHocaGUI_Launcher.
-  * Allow automatic image branding (splash, about image, tray icon) by
-    setting another application name than the default.
-  * Rename icon files to match default application name (PyHoca-GUI).
-  * Make default cmdline option parameters overridable before the
-    arg parser gets initialized.
-  * Make SCRIPT_NAME in setup.py configurable (monkey-patchable).
-  * Make setup.py importable, only run setup() function on direct calls.
-  * Don't refer to py2exe anymore in nsis_template's naming scheme.
-  * Provide separate mswin_logging module.
-  * Install more modules into setup.exe: hmac (for ecdsa).
-  * NSIS script: empty installation destination before installing new files
-    into $INSTDIR.
-  * Allow appname based mini icons on About... windows.
-  * Make the hover text of the tray icon brandable (drop hard-coded
-    PyHoca-GUI application name).
-  * NSIS script: make sure SetOutPath gets called at the beginning of
-    every section.
-  * Show printing preferences when tray icon is in restricted mode.
-  * Make sure X2GoClientXConfig configuration files really get written to
-    disk after recent changes to the inifile.py code.
+  * New upstream version (0.5.0.0):
+    - Add X2Go Session Broker support.
+    - Adapt to new backend concept found in Python X2Go (>= 0.5.0.0).
+    - Move most code of the pyhoca-gui executable into a dedicated class
+      named PyHocaGUI_Launcher.
+    - Allow automatic image branding (splash, about image, tray icon) by
+      setting another application name than the default.
+    - Rename icon files to match default application name (PyHoca-GUI).
+    - Make default cmdline option parameters overridable before the
+      arg parser gets initialized.
+    - Make SCRIPT_NAME in setup.py configurable (monkey-patchable).
+    - Make setup.py importable, only run setup() function on direct calls.
+    - Don't refer to py2exe anymore in nsis_template's naming scheme.
+    - Provide separate mswin_logging module.
+    - Install more modules into setup.exe: hmac (for ecdsa).
+    - NSIS script: empty installation destination before installing new files
+      into $INSTDIR.
+    - Allow appname based mini icons on About... windows.
+    - Make the hover text of the tray icon brandable (drop hard-coded
+      PyHoca-GUI application name).
+    - NSIS script: make sure SetOutPath gets called at the beginning of
+      every section.
+    - Show printing preferences when tray icon is in restricted mode.
+    - Fix check_running() method in PyHocaGUI_Launcher on MS Windows.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 08 Jan 2014 21:28:37 +0100
 
diff --git a/pyhoca/wxgui/launcher.py b/pyhoca/wxgui/launcher.py
index af703e9..b4ed4f9 100644
--- a/pyhoca/wxgui/launcher.py
+++ b/pyhoca/wxgui/launcher.py
@@ -108,8 +108,9 @@ VERSION: %s
             reload(taskbar)
 
     def check_running(self):
-        if X2GOCLIENT_OS  in ('Linux', 'Mac'):
+        _executable = os.path.basename(sys.argv[0]).replace('.exe', '')
 
+        if X2GOCLIENT_OS  in ('Linux', 'Mac'):
             p = subprocess.Popen(['ps', '-U', CURRENT_LOCAL_USER, '-u', CURRENT_LOCAL_USER], stdout=subprocess.PIPE)
             psA_out = p.communicate()
             if psA_out[0].count(self.PROG_NAME) <= 1:

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git



More information about the x2go-commits mailing list