[X2Go-Commits] [pyhoca-gui] 01/03: Fix win32 build (Fixes: #649)

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository pyhoca-gui.

commit d02f98964b825b426022c3b82f5bdde9053138b0
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Sat Jan 24 01:03:52 2015 -0500

    Fix win32 build (Fixes: #649)
    
    Conflicts:
    	debian/changelog
---
 debian/changelog        |    4 ++++
 pyhoca/wxgui/taskbar.py |    7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4827fa1..fb3b4f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ pyhoca-gui (0.5.0.4-0x2go1) UNRELEASED; urgency=medium
   * New upstream version (0.5.0.4):
     - Add Turkish translation to PyHoca-GUI.
 
+  [ Mike DePaulo ]
+  * New upstream version (0.5.0.4):
+    - Fix win32 build (missing win32gui.pyd) (Fixes: #649)
+
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 27 Nov 2014 12:34:20 +0100
 
 pyhoca-gui (0.5.0.3-0x2go1) unstable; urgency=medium
diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py
index daf88bc..e7f1ce9 100644
--- a/pyhoca/wxgui/taskbar.py
+++ b/pyhoca/wxgui/taskbar.py
@@ -26,6 +26,13 @@ import x2go
 import wx
 import os
 
+# Warning: If pyflakes says you should delete these 2 lines,
+# then pyflakes is wrong. Deleting these 2 lines will break
+# the Windows build by preventing win32gui.pyd from being
+# copied over.
+if x2go.X2GOCLIENT_OS == 'Windows':
+    import win32gui
+
 # PyHoca-GUI modules
 import menus_taskbar
 import basepath

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