[X2Go-Commits] pyhoca-gui.git - master (branch) updated: 0.4.0.8-21-gfc15db6

[X2Go dev team]

The branch, master has been updated
       via  fc15db627d8ad3232979a469dde294b572318a47 (commit)
      from  c0621096c422cdb8931c717a05ac304c2bacf93c (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 fc15db627d8ad3232979a469dde294b572318a47
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Nov 15 22:04:23 2013 +0100

    Allow for full path about image icon names, resolve tilde char in icon file path.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog      |    2 ++
 pyhoca/wxgui/about.py |    9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 3727545..aba2997 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ pyhoca-gui (0.4.0.9-0~x2go1) UNRELEASED; urgency=low
       with double click from the list of available desktop sessions.
     - Allow for full path taskbar icon names, resolve tilde char in icon file
       path.
+    - 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.
     - Allow multiple PyHoca-GUI instances for the same user, one per $DISPLAY.
   * /debian/copyright:
diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py
index 1343599..eae5413 100644
--- a/pyhoca/wxgui/about.py
+++ b/pyhoca/wxgui/about.py
@@ -105,7 +105,14 @@ class PyHocaGUI_AboutFrame(wx.Frame):
         elif "wxMAC" in wx.PlatformInfo:
             icon_size = '128x128'
 
-        icon_file = os.path.normpath('%s/PyHoca/%s/%s.png' % (basepath.icons_basepath, icon_size, icon_name))
+        icon_name = os.path.expanduser(icon_name)
+        if not icon_name.lower().endswith('.png'):
+            icon_name = '%s.png' % icon_name
+
+        icon_file = icon_name
+        if not (os.path.isfile(str(icon_file)) or os.path.islink(str(icon_file))):
+            icon_file = '%s/PyHoca/%s/%s' % (basepath.icons_basepath, icon_size, icon_name)
+
         if not (os.path.isfile(str(icon_file)) or os.path.islink(str(icon_file))):
             icon_file = os.path.normpath('%s/PyHoca/%s/%s.png' % (basepath.icons_basepath, icon_size, 'pyhoca-winicon'))
 


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