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

[X2Go dev team]

The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
       via  b15b026507355da01f19925b1c864a7d82f3579f (commit)
      from  f8fc633098b1c35bbcce8b2be0a63a2ef5ecc439 (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:
 debian/changelog        |    1 +
 pyhoca/wxgui/splash.py  |    4 ++--
 pyhoca/wxgui/taskbar.py |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index e46a53e..ddd42e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -132,6 +132,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
     - Fallback to default splash image if the custom splash does not exist.
     - Do not crash if a provided system tray icon cannot be found. Use a
       fallback icon instead.
+    - os.path.is<type> require string option, not Unicode.
   * Depend on Python X2Go 0.1.2.0.
   * Install GNOME icons via dh_links.
   * Install X2Go icons with explicit install paths.
diff --git a/pyhoca/wxgui/splash.py b/pyhoca/wxgui/splash.py
index af35bab..86b659b 100644
--- a/pyhoca/wxgui/splash.py
+++ b/pyhoca/wxgui/splash.py
@@ -40,13 +40,13 @@ class PyHocaGUI_SplashScreen(wx.SplashScreen):
         if splash_image and os.path.basename(splash_image) == splash_image:
             splash_image = os.path.join(basepath.images_basepath, splash_image)
 
-        if not os.path.isfile(splash_image):
+        if not os.path.isfile(str(splash_image)):
             splash_image = None
 
         if splash_image is None:
             splash_image = os.path.join(basepath.images_basepath, 'pyhoca-splash.png')
 
-        if os.path.isfile(splash_image):
+        if os.path.isfile(str(splash_image)):
             splash_wximage = wx.Image(splash_image, wx.BITMAP_TYPE_PNG, )
             splash_wximage.Rescale(400, int(float(400)/splash_wximage.Width*splash_wximage.Height))
 
diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py
index cafd03b..b1ca28c 100644
--- a/pyhoca/wxgui/taskbar.py
+++ b/pyhoca/wxgui/taskbar.py
@@ -132,7 +132,7 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon):
             icon_name = fallback_name
 
         icon_file = '%s/PyHoca/%s/%s.png' % (_icons_location, icon_size, icon_name)
-        if not (os.path.isfile(icon_file) or os.path.islink(icon_file)):
+        if not (os.path.isfile(str(icon_file)) or os.path.islink(str(icon_file))):
             icon_file = '%s/PyHoca/%s/%s.png' % (_icons_location, icon_size, fallback_name)
 
         img = wx.Image(icon_file)


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