x2go-commits April 2013

x2go-commits@lists.x2go.org

2 participants
1376 discussions

x2gobroker.git - master (branch) updated: 0.0.1.0-51-g4728afa
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, master has been updated via 4728afa79980af5529f7abfbc74d146c3e41e79d (commit) from 39b86db4b2b00b42213498ea2dcb1c3bb89430c0 (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 4728afa79980af5529f7abfbc74d146c3e41e79d Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Apr 7 11:38:48 2013 +0200 enable BR tests in test unit ----------------------------------------------------------------------- Summary of changes: x2gobroker/tests/test_web_plain_zeroconf.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/x2gobroker/tests/test_web_plain_zeroconf.py b/x2gobroker/tests/test_web_plain_zeroconf.py index dad829b..8b98daf 100644 --- a/x2gobroker/tests/test_web_plain_zeroconf.py +++ b/x2gobroker/tests/test_web_plain_zeroconf.py @@ -52,11 +52,10 @@ desktop-shell = KDE r.mustcontain('START_USER_SESSIONS') r.mustcontain('command=KDE') r.mustcontain('END_USER_SESSIONS') - # FIXME: get html tags out of the text/plain web renderer, needs patching of X2Go Client - #r.mustcontain(no=' ',) - #r.mustcontain(no=' ',) - #r.mustcontain(no=' ', ) - #r.mustcontain(no=' ', ) + r.mustcontain(no=' ',) + r.mustcontain(no=' ',) + r.mustcontain(no=' ', ) + r.mustcontain(no=' ', ) tf.close() _config = """ [zeroconf] hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.1.0-48-g1c22ef9
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, master has been updated via 1c22ef97db768e352e9b0b6ec4bb3802f2983946 (commit) from 4922dbc886553349ce9f76fbebe4fee2ccc7dc63 (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 1c22ef97db768e352e9b0b6ec4bb3802f2983946 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Apr 17 21:15:51 2013 +0200 fix dependency set of x2gobroker-wsgi ----------------------------------------------------------------------- Summary of changes: debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/control b/debian/control index 2beef36..cfe63c6 100644 --- a/debian/control +++ b/debian/control @@ -58,6 +58,7 @@ Depends: python-argparse, python-setproctitle, python-tornado, + python-wsgilog, python-x2gobroker (>= ${source:Version}), python-x2gobroker (<< ${source:Version}.1~), Suggests: apache2 | httpd, @@ -155,7 +156,7 @@ Depends: ${python:Depends}, python, adduser, - python-wsgilog, + x2gobroker (>= ${source:Version}), x2gobroker (<< ${source:Version}.1~), Suggests: apache2, Description: X2Go http(s) based session broker (CGI) hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.1.0-52-gb5a173b
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, master has been updated via b5a173b396f9c0d54a47b42a42c55f06580343a4 (commit) from 4728afa79980af5529f7abfbc74d146c3e41e79d (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 b5a173b396f9c0d54a47b42a42c55f06580343a4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sun Apr 7 12:00:51 2013 +0200 remove debug output ----------------------------------------------------------------------- Summary of changes: x2gobroker/tests/test_broker_zeroconf.py | 2 -- 1 file changed, 2 deletions(-) The diff of changes is: diff --git a/x2gobroker/tests/test_broker_zeroconf.py b/x2gobroker/tests/test_broker_zeroconf.py index 1a42278..485e8bd 100644 --- a/x2gobroker/tests/test_broker_zeroconf.py +++ b/x2gobroker/tests/test_broker_zeroconf.py @@ -75,8 +75,6 @@ class TestX2GoBrokerBackendZeroconf(unittest.TestCase): _test_profiles = { _key: list_of_profiles['unittest'] } - for key in _profiles[_key]: - print key, _profiles[_key][key], _test_profiles[_key][key] self.assertEqual(_profiles, _test_profiles) ### TEST: select_profile() method hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.1.0-46-g1e70ec0
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, master has been updated via 1e70ec048687676bd15654ff60aed29f26288d75 (commit) from 692561e8fe83789863ae6a04e6e4a747f859bc03 (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 1e70ec048687676bd15654ff60aed29f26288d75 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Apr 23 20:57:53 2013 +0200 missing comma in test_broker_inifile.py ----------------------------------------------------------------------- Summary of changes: x2gobroker/tests/test_broker_inifile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/x2gobroker/tests/test_broker_inifile.py b/x2gobroker/tests/test_broker_inifile.py index 9d163eb..6bc62f8 100644 --- a/x2gobroker/tests/test_broker_inifile.py +++ b/x2gobroker/tests/test_broker_inifile.py @@ -192,7 +192,7 @@ acl-users-order = deny-allow u'fullscreen': False, u'width': 800, u'height': 600, - u'applications': ['TERMINAL','WWWBROWSER',] + u'applications': ['TERMINAL','WWWBROWSER',], } ) _expected_profile1 = copy.deepcopy(_expected_defaults) _expected_profile1.update({ hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.1.0-47-g4922dbc
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, master has been updated via 4922dbc886553349ce9f76fbebe4fee2ccc7dc63 (commit) from 1e70ec048687676bd15654ff60aed29f26288d75 (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 4922dbc886553349ce9f76fbebe4fee2ccc7dc63 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Apr 23 21:00:00 2013 +0200 add directrdp to session profiles defaults ----------------------------------------------------------------------- Summary of changes: etc/broker/x2gobroker-sessionprofiles.conf | 1 + x2gobroker/defaults.py | 1 + 2 files changed, 2 insertions(+) The diff of changes is: diff --git a/etc/broker/x2gobroker-sessionprofiles.conf b/etc/broker/x2gobroker-sessionprofiles.conf index 8031d9e..8d060ec 100644 --- a/etc/broker/x2gobroker-sessionprofiles.conf +++ b/etc/broker/x2gobroker-sessionprofiles.conf @@ -60,6 +60,7 @@ dpi=96 sshport=22 setdpi=0 pack=16m-jpeg +directrdp=false ### EXAMPLES: Below you find some config examples. Adapt them to your needs or ### simply write your own session profiles and remove the examples below. diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 8d08a33..7961f7d 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -193,6 +193,7 @@ X2GOBROKER_SESSIONPROFILE_DEFAULTS = { u'pack': u'16m-jpeg', u'user': '', u'host': [ u'localhost', ], + u'directrdp': False, u'acl-users-allow': [], u'acl-users-deny': [], u'acl-users-order': '', hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2gobroker.git - master (branch) updated: 0.0.1.0-44-gabc7296
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, master has been updated via abc72963617a4c27b376efacbc46cfbe4de4237a (commit) from 7da7e324930cf1e2265672853609746244fa374e (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 abc72963617a4c27b376efacbc46cfbe4de4237a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Sat Apr 6 13:39:43 2013 +0200 Add cmd and directrdp session profile parameters to defaults. Conflicts (resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2gobroker/defaults.py | 1 + x2gobroker/tests/test_broker_base.py | 1 + 3 files changed, 3 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index b497da4..39d3dfd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ x2gobroker (0.0.1.1-0~x2go1) UNRELEASED; urgency=low - Add script: x2gobroker-testauth. - Add enable()/disable() methods to broker backends. - Move complete authservice logic into x2gobroker-authservice script. + - Add cmd and directrdp session profile parameters to defaults. * /debian/control: + Fix --root parameter in DEB_PYTHON_INSTALL_ARGS. + Let bin:package x2gobroker-authservice depend on python-x2gobroker (of the diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 0c7c2c5..ca70e82 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -160,6 +160,7 @@ X2GOBROKER_CONFIG_DEFAULTS = { # defaults for X2Go Sessino Broker session profiles file X2GOBROKER_SESSIONPROFILE_DEFAULTS = { u'DEFAULT': { + u'cmd': u'TERMINAL', u'defsndport': True, u'useiconv': False, u'iconvfrom': u'UTF-8', diff --git a/x2gobroker/tests/test_broker_base.py b/x2gobroker/tests/test_broker_base.py index 0bda18e..ac710b8 100644 --- a/x2gobroker/tests/test_broker_base.py +++ b/x2gobroker/tests/test_broker_base.py @@ -274,6 +274,7 @@ check-credentials = false def test_getdefaultprofile(self): base_backend = self._init_base_backend() _expected_profile = { + 'cmd': 'TERMINAL', 'defsndport': True, 'useiconv': False, 'iconvfrom': 'UTF-8', hooks/post-receive -- x2gobroker.git (HTTP(S) Session broker for X2Go) 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 "x2gobroker.git" (HTTP(S) Session broker for X2Go).

1 0

x2goclient.git - master (branch) updated: 4.0.1.0-12-g6f39566
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, master has been updated via 6f395663b0083c1be701c3c40a673c241b664797 (commit) from 484f99b0ee9cdd04a4004981c8d3036527080191 (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 6f395663b0083c1be701c3c40a673c241b664797 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Apr 22 17:00:36 2013 +0200 typo fix in changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 57c657b..43bd77f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,7 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.0.1.1): - If a priv SSH key has been specified, skip the autologin procedure. Let's consider a given SSH private key that fails to log the user - in as an overall login failure. (Fixes: 141). + in as an overall login failure. (Fixes: #141). [ Orion Poplawski ] * New upstream version (4.0.1.1): hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 4.0.1.0-11-g484f99b
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, master has been updated via 484f99b0ee9cdd04a4004981c8d3036527080191 (commit) from 56c9d3ab2021549fc2fede7f5bceac0af342fc73 (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 484f99b0ee9cdd04a4004981c8d3036527080191 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Apr 22 16:26:24 2013 +0200 fix upstream version in changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 94d57e2..57c657b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,19 +1,19 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low [ Oleksandr Shneyder ] - * New upstream version (4.0.1.0): + * New upstream version (4.0.1.1): - Use "127.0.0.1" instead of localhost to avoid wrong IPv6 hostname resolution. (Fixes: #151). - Wait for x2gocmdexitmessage to return before closing in hidden mode. [ Mike Gabriel ] - * New upstream version (4.0.1.0): + * New upstream version (4.0.1.1): - If a priv SSH key has been specified, skip the autologin procedure. Let's consider a given SSH private key that fails to log the user in as an overall login failure. (Fixes: 141). [ Orion Poplawski ] - * New upstream version (4.0.1.0): + * New upstream version (4.0.1.1): - Instead of using a hard-code DPI of 96, use local DPI settings for new sessions if not explicitly set in session profile (Fixes: #164). hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 4.0.1.0-10-g56c9d3a
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

The branch, master has been updated via 56c9d3ab2021549fc2fede7f5bceac0af342fc73 (commit) from 627cd24cb270a0c167bef64867e78e772925640e (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 56c9d3ab2021549fc2fede7f5bceac0af342fc73 Author: Orion Poplawski <orion(a)cora.nwra.com> Date: Mon Apr 22 16:25:48 2013 +0200 Instead of using a hard-code DPI of 96, use local DPI settings for new sessions if not explicitly set in session profile (Fixes: #164). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 5 +++++ onmainwindow.cpp | 14 +++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 9be4d80..94d57e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,11 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low Let's consider a given SSH private key that fails to log the user in as an overall login failure. (Fixes: 141). + [ Orion Poplawski ] + * New upstream version (4.0.1.0): + - Instead of using a hard-code DPI of 96, use local DPI settings for new + sessions if not explicitly set in session profile (Fixes: #164). + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Fri, 22 Mar 2013 23:21:11 +0100 x2goclient (4.0.1.0-0~x2go1) unstable; urgency=low diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 31dbc17..5f37cc1 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -61,8 +61,6 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) showHaltBtn=false; defaultUseSound=true; defaultSetKbd=true; - defaultSetDPI=false; - defaultDPI=96; extStarted=false; cmdAutologin=false; defaultLink=2; @@ -107,6 +105,16 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent ) cmdAutologin=false; +// Try to determine the native DPI and use it for the default + int dpix = QApplication::desktop()->physicalDpiX(); + int dpiy = QApplication::desktop()->physicalDpiY(); + if ( dpix >0 && dpiy >0) { + defaultSetDPI=true; + defaultDPI=(dpix+dpiy)/2; + } else { + defaultSetDPI=false; + defaultDPI=96; + } #ifdef Q_OS_WIN clientSshPort="7022"; @@ -6661,7 +6669,7 @@ void ONMainWindow::showHelp() "--user=<username>\t\t select user 'username'\n" "--geomerty=<W>x<H>|fullscreen\t set default geometry, default " "value '800x600'\n" - "--dpi=<dpi>\t\t\t set dpi of x2goagent to dpi, default not set\n" + "--dpi=<dpi>\t\t\t set dpi of x2goagent to dpi, default set to same as local display\n" "--link=<modem|isdn|adsl|wan|lan> set default link type, " "default 'adsl'\n" "--pack=<packmethod>\t\t set default pack method, default " hooks/post-receive -- x2goclient.git (X2Go Client) 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 "x2goclient.git" (X2Go Client).

1 0

x2goclient.git - master (branch) updated: 4.0.1.0-11-g484f99b
by git-admin＠x2go.org 23 Apr '13

23 Apr '13

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits April 2013