This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository python-x2go. commit b1292aac09d048bac9f6f2c1ca1d29275fd4f6af Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Aug 30 17:09:55 2014 +0200 Use Xlib to detect client-side destop geometry. --- debian/changelog | 1 + x2go/utils.py | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4d91415..eb01178 100644 --- a/debian/changelog +++ b/debian/changelog @@ -81,6 +81,7 @@ python-x2go (0.5.0.0-0x2go1) UNRELEASED; urgency=low - On non-Windows platforms, enforce usage of the "ares" DNS resolver in python-gevent (which is available since Python gevent 1.0~). (Fixes: #588). + - Use Xlib to detect client-side destop geometry. * debian/control: + Add dependencies: python-requests, python-simplejson. * python-x2go.spec: diff --git a/x2go/utils.py b/x2go/utils.py index 074bfb3..94f966b 100644 --- a/x2go/utils.py +++ b/x2go/utils.py @@ -664,12 +664,9 @@ def get_desktop_geometry(): """ if _X2GOCLIENT_OS != 'Windows': - p = subprocess.Popen(['xprop', '-root', '_NET_DESKTOP_GEOMETRY',], stdout=subprocess.PIPE, ) - _paramval = p.stdout.read().split("=") - if len(_paramval) == 2: - _list = _paramval[1].rstrip('\n').split(',') - if len(_list) == 2: - return (_list[0].strip(), _list[1].strip()) + display = _X_DISPLAY + root = display.screen().root + return (root.get_geometry().width, root.get_geometry().height) return None -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/python-x2go.git