[X2Go-Commits] pyhoca-gui.git - master (branch) updated: 0.4.0.8-24-gf9a2213
X2Go dev team
git-admin at x2go.org
Fri Nov 15 22:19:32 CET 2013
The branch, master has been updated
via f9a2213d9066df3130a958276ab922055e0475c3 (commit)
from 14b4e4ab4882ba30bceeed2701909b4de837451b (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 -----------------------------------------------------------------
commit f9a2213d9066df3130a958276ab922055e0475c3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Nov 15 22:19:14 2013 +0100
Resolve tilde char in file path of the splash image.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
pyhoca/wxgui/splash.py | 3 +++
2 files changed, 4 insertions(+)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 05fb004..db0c42d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ pyhoca-gui (0.4.0.9-0~x2go1) UNRELEASED; urgency=low
- Allow for full path about image icon names, resolve tilde char in icon
file path.
- Resolve tilde char in file path of the about image.
+ - Resolve tilde char in file path of the splash image.
- Allow multiple PyHoca-GUI instances for the same user, one per $DISPLAY.
- Resolve tilde char in base directories for the PyHoca-GUI application.
* /debian/copyright:
diff --git a/pyhoca/wxgui/splash.py b/pyhoca/wxgui/splash.py
index adb353c..fb8744d 100644
--- a/pyhoca/wxgui/splash.py
+++ b/pyhoca/wxgui/splash.py
@@ -47,6 +47,9 @@ class PyHocaGUI_SplashScreen(wx.SplashScreen):
@type splash_image: C{str}
"""
+ if splash_image:
+ splash_image = os.path.expanduser(splash_image)
+
if splash_image and os.path.basename(splash_image) == splash_image:
splash_image = os.path.join(basepath.images_basepath, splash_image)
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