The branch, master has been updated via 8ea6a8974d12859751905c12544068bf6a01dd61 (commit) from fb94f4107a8a63367b9cf9dac3d81b543ca9b365 (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 8ea6a8974d12859751905c12544068bf6a01dd61 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Dec 10 09:49:06 2011 +0100 new Xlib code shall only be used on non-Windows platforms ----------------------------------------------------------------------- Summary of changes: x2go/utils.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2go/utils.py b/x2go/utils.py index 8ec0862..9ebc196 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -35,8 +35,12 @@ import gevent import string import re import subprocess -import Xlib -import Xlib.display + +if _X2GOCLIENT_OS != "Windows": + import Xlib + import Xlib.display +else: + import win32api # Python X2go modules from defaults import X2GOCLIENT_OS as _X2GOCLIENT_OS hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).