x2go-commits

x2go-commits@lists.x2go.org

1 participants
37914 discussions

x2gobroker.git - build-main (branch) updated: 0.0.2.2
by git-admin＠x2go.org 22 May '13

22 May '13

The branch, build-main has been updated via 6a16a5739fc702c12d3cc8738837a8a29cae8c12 (commit) from 171e8df1620f71bef0600fe3d8380c8d2a493758 (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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f14bb75..e887cc5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2gobroker (0.0.2.2-0~x2go1) UNRELEASED; urgency=low +x2gobroker (0.0.2.2-0~x2go1) unstable; urgency=low * New upstream version (0.0.2.2): - Convert unicode type host fields into single element lists. Fix @@ -6,7 +6,7 @@ x2gobroker (0.0.2.2-0~x2go1) UNRELEASED; urgency=low - Correctly incorporate path to x2gobroker-agent.pl into x2gobroker-agent setuid wrapper. (Fixes: #216). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 13:12:51 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 May 2013 17:32:03 +0200 x2gobroker (0.0.2.1-0~x2go1) unstable; urgency=low 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 - build-main (branch) updated: 0.0.2.1-4-g171e8df
by git-admin＠x2go.org 22 May '13

22 May '13

The branch, build-main has been updated via 171e8df1620f71bef0600fe3d8380c8d2a493758 (commit) from 44fb5f47579b3b2cde8093ce8c05b46e11a13e67 (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: Makefile | 6 +++--- debian/changelog | 2 ++ debian/rules | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index acfd7b7..cb6a1b8 100755 --- a/Makefile +++ b/Makefile @@ -34,8 +34,8 @@ LDFLAGS += -pie RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= -PREFIX=/usr/local +DESTDIR ?= +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin SBINDIR=$(PREFIX)/sbin @@ -56,7 +56,7 @@ build: build-arch build-indep build-arch: build_setuidwrappers build_setuidwrappers: - $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(DESTDIR)$(LIBDIR)/x2gobroker-agent.pl\" -o lib/x2gobroker-agent src/x2gobroker-agent.c + $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(LIBDIR)/x2gobroker-agent.pl\" -o lib/x2gobroker-agent src/x2gobroker-agent.c build-indep: diff --git a/debian/changelog b/debian/changelog index 0749ee7..f14bb75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ x2gobroker (0.0.2.2-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.0.2.2): - Convert unicode type host fields into single element lists. Fix UCCS+zeroconf tests. + - Correctly incorporate path to x2gobroker-agent.pl into x2gobroker-agent + setuid wrapper. (Fixes: #216). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 13:12:51 +0200 diff --git a/debian/rules b/debian/rules index da48cec..4eb9899 100755 --- a/debian/rules +++ b/debian/rules @@ -22,6 +22,7 @@ #export DEB_CFLAGS_MAINT_APPEND = -Wall #include /usr/share/dpkg/buildflags.mk +export PREFIX=/usr include /usr/share/cdbs/1/rules/debhelper.mk DEB_PYTHON_SYSTEM = $(shell test -f /usr/bin/dh_python2 && echo "" || echo "pysupport") 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 - build-main (branch) updated: 0.0.2.1-2-gff5d005
by git-admin＠x2go.org 22 May '13

22 May '13

The branch, build-main has been updated via ff5d005efbaabf23d034af46fae4310445f173c1 (commit) from 35fd3a951ed12de18f36e0c4f4b66078afc3e483 (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 | 6 ++++++ sbin/x2gobroker-pubkeyauthorizer | 2 +- x2gobroker/__init__.py | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index badca68..353fe2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2gobroker (0.0.2.2-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 13:12:51 +0200 + x2gobroker (0.0.2.1-0~x2go1) unstable; urgency=low [ Mike Gabriel ] diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index 8c44126..ec593e4 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -36,7 +36,7 @@ import logging.config from pwd import getpwnam from grp import getgrnam -__VERSION__ = '0.0.2.1' +__VERSION__ = '0.0.2.2' __AUTHOR__ = 'Mike Gabriel (X2Go Project) <mike.gabriel(a)das-netzwerkteam.de>' PROG_NAME = os.path.basename(sys.argv[0]) diff --git a/x2gobroker/__init__.py b/x2gobroker/__init__.py index a84e978..1a37a25 100644 --- a/x2gobroker/__init__.py +++ b/x2gobroker/__init__.py @@ -18,5 +18,5 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.0.2.1' +__VERSION__ = '0.0.2.2' __AUTHOR__ = 'Mike Gabriel (X2Go Project) <mike.gabriel(a)das-netzwerkteam.de>' 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 - build-main (branch) updated: 0.0.2.1-3-g44fb5f4
by git-admin＠x2go.org 22 May '13

22 May '13

The branch, build-main has been updated via 44fb5f47579b3b2cde8093ce8c05b46e11a13e67 (commit) from ff5d005efbaabf23d034af46fae4310445f173c1 (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 | 4 +++- x2gobroker/tests/test_broker_inifile.py | 1 - x2gobroker/tests/test_web_uccs_zeroconf.py | 24 ++++++++++++++++++++---- x2gobroker/web/uccs.py | 9 +++++++-- 4 files changed, 30 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 353fe2f..0749ee7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ x2gobroker (0.0.2.2-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (0.0.2.2): + - Convert unicode type host fields into single element lists. Fix + UCCS+zeroconf tests. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 13:12:51 +0200 diff --git a/x2gobroker/tests/test_broker_inifile.py b/x2gobroker/tests/test_broker_inifile.py index 1e99f7a..b7181a4 100644 --- a/x2gobroker/tests/test_broker_inifile.py +++ b/x2gobroker/tests/test_broker_inifile.py @@ -86,7 +86,6 @@ command = GNOME } ) _expected_profile = copy.deepcopy(_expected_defaults) _profile = inifile_backend.get_profile('testprofile') - print _expected_defaults for key in _expected_profile.keys(): self.assertTrue( ( key in _profile.keys() ) ) for key in _profile.keys(): diff --git a/x2gobroker/tests/test_web_uccs_zeroconf.py b/x2gobroker/tests/test_web_uccs_zeroconf.py index b796fb5..d02a1a5 100644 --- a/x2gobroker/tests/test_web_uccs_zeroconf.py +++ b/x2gobroker/tests/test_web_uccs_zeroconf.py @@ -23,12 +23,16 @@ from paste.fixture import TestApp from nose.tools import * import tornado.wsgi import json +import base64 # Python X2GoBroker modules import x2gobroker.defaults import x2gobroker.web.uccs -urls = ( ('/uccs/(.*)', x2gobroker.web.uccs.X2GoBrokerWeb,) ,) +urls = ( + ('/uccs/[a-zA-Z]*(/*)$', x2gobroker.web.uccs.X2GoBrokerWeb,), + ('/uccs/(.*)/api/([0-9])(/*)$', x2gobroker.web.uccs.X2GoBrokerWebAPI,), +) application = tornado.wsgi.WSGIApplication(urls) class TestX2GoBrokerWebUccsZeroConf(unittest.TestCase): @@ -40,20 +44,24 @@ class TestX2GoBrokerWebUccsZeroConf(unittest.TestCase): u'URL': u'http://localhost:8080/uccs/zeroconf', u'AdditionalManagementServers': [], u'Name': u'X2Go Session Broker', + u'DefaultServer': u'LOCALHOST', u'RemoteDesktopServers': [ { u'Username': u'', u'Protocol': u'x2go', u'Name': u'LOCALHOST', - u'URL': u'localhost:22', + u'URL': u'http://localhost:22/', + u'SessionType': u'KDE', u'SessionTypeRequired': True, - u'Password': None + u'Password': u'', }, ], + u'URL': u'http://localhost:8080/uccs/zeroconf/', } _config = """ [global] enable-uccs-output=true +check-credentials=false [zeroconf] enable = true @@ -65,7 +73,15 @@ desktop-shell = KDE tf.seek(0) x2gobroker.defaults.X2GOBROKER_CONFIG = tf.name testApp = TestApp(application) - r = testApp.get('/uccs/zeroconf/', params={'user': 'test', 'password': 'sweet', 'task': 'listsessions', }, expect_errors=True) + + #username = 'test' + #password = 'sweet' + #base64String = base64.encodestring('{username}:{password}'.format(username=username, password=password))[:-1] + #authHeader = "Basic {authcred}".format(authcred=base64String) + #headers = {'Authorization': authHeader} + headers = {} + + r = testApp.get('/uccs/zeroconf/api/4', headers=headers, expect_errors=True) assert_equal(r.status, 200) body = r.normal_body result = json.loads(body) diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py index 8422664..e518640 100644 --- a/x2gobroker/web/uccs.py +++ b/x2gobroker/web/uccs.py @@ -24,6 +24,7 @@ import re import base64 import datetime +import types import tornado.web # Python X2Go Broker modules @@ -142,16 +143,20 @@ class X2GoBrokerWebAPI(tornado.web.RequestHandler): for profile_id in profile_ids: + hosts = profiles[profile_id][u'host'] + if type(hosts) == types.UnicodeType: + hosts = [hosts] + if profiles[profile_id][u'directrdp']: ts = x2gobroker.uccsjson.RDPServer( - host='{hostname}'.format(hostname=profiles[profile_id][u'host'][0]), + host='{hostname}'.format(hostname=hosts[0]), name=profiles[profile_id][u'name'], username=profiles[profile_id][u'user'], ) ts.set_domain('LOCAL') else: ts = x2gobroker.uccsjson.X2GoServer( - host='{hostname}:{port}'.format(hostname=profiles[profile_id][u'host'][0], port=profiles[profile_id][u'sshport']), + host='{hostname}:{port}'.format(hostname=hosts[0], port=profiles[profile_id][u'sshport']), name=profiles[profile_id][u'name'], username=profiles[profile_id][u'user'], ) 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 - build-main (branch) updated: 0.0.2.1-1-g35fd3a9
by git-admin＠x2go.org 22 May '13

22 May '13

The branch, build-main has been updated via 35fd3a951ed12de18f36e0c4f4b66078afc3e483 (commit) from e0e9815beaf7d6de843ca0386cd92ed6cd14433f (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: Makefile | 6 +++--- bin/x2gobroker-testauth | 6 +++--- debian/rules | 2 +- etc/broker/x2gobroker-authservice-logger.conf | 6 +++--- etc/broker/x2gobroker-loggers.conf | 6 +++--- lib/x2gobroker-agent.pl | 6 +++--- sbin/x2gobroker | 6 +++--- sbin/x2gobroker-authservice | 6 +++--- sbin/x2gobroker-keygen | 6 +++--- sbin/x2gobroker-pubkeyauthorizer | 6 +++--- setup.py | 6 +++--- src/x2gobroker-agent.c | 6 +++--- x2gobroker/__init__.py | 4 ++-- x2gobroker/agent.py | 6 +++--- x2gobroker/authmechs/__init__.py | 4 ++-- x2gobroker/authmechs/base_authmech.py | 4 ++-- x2gobroker/authmechs/pam_authmech.py | 4 ++-- x2gobroker/authmechs/testsuite_authmech.py | 4 ++-- x2gobroker/authservice.py | 6 +++--- x2gobroker/basicauth.py | 6 +++--- x2gobroker/brokers/__init__.py | 4 ++-- x2gobroker/brokers/base_broker.py | 4 ++-- x2gobroker/brokers/inifile_broker.py | 4 ++-- x2gobroker/brokers/zeroconf_broker.py | 4 ++-- x2gobroker/config.py | 2 +- x2gobroker/defaults.py | 6 +++--- x2gobroker/loggers.py | 6 +++--- x2gobroker/nameservices/__init__.py | 4 ++-- x2gobroker/nameservices/base_nameservice.py | 4 ++-- x2gobroker/nameservices/libnss_nameservice.py | 4 ++-- x2gobroker/nameservices/testsuite_nameservice.py | 4 ++-- x2gobroker/tests/test_broker_base.py | 2 +- x2gobroker/tests/test_broker_inifile.py | 2 +- x2gobroker/tests/test_broker_zeroconf.py | 2 +- x2gobroker/tests/test_utils.py | 2 +- x2gobroker/tests/test_web_plain_base.py | 2 +- x2gobroker/tests/test_web_plain_inifile.py | 2 +- x2gobroker/tests/test_web_plain_zeroconf.py | 2 +- x2gobroker/tests/test_web_uccs_zeroconf.py | 2 +- x2gobroker/uccsjson.py | 6 +++--- x2gobroker/utils.py | 6 +++--- x2gobroker/web/__init__.py | 4 ++-- x2gobroker/web/extras.py | 6 +++--- x2gobroker/web/plain.py | 6 +++--- x2gobroker/web/uccs.py | 6 +++--- x2gobroker/x2gobroker_exceptions.py | 4 ++-- 46 files changed, 103 insertions(+), 103 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index 7a4f317..acfd7b7 100755 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ #!/usr/bin/make -f # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2011-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/bin/x2gobroker-testauth b/bin/x2gobroker-testauth index d8ef295..bc97751 100755 --- a/bin/x2gobroker-testauth +++ b/bin/x2gobroker-testauth @@ -1,9 +1,9 @@ #!/usr/bin/env python # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2011-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/debian/rules b/debian/rules index 321f0cc..da48cec 100755 --- a/debian/rules +++ b/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/etc/broker/x2gobroker-authservice-logger.conf b/etc/broker/x2gobroker-authservice-logger.conf index 9c3e0c9..51966f8 100644 --- a/etc/broker/x2gobroker-authservice-logger.conf +++ b/etc/broker/x2gobroker-authservice-logger.conf @@ -1,7 +1,7 @@ # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2011-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/etc/broker/x2gobroker-loggers.conf b/etc/broker/x2gobroker-loggers.conf index e2edd23..3dc7a34 100644 --- a/etc/broker/x2gobroker-loggers.conf +++ b/etc/broker/x2gobroker-loggers.conf @@ -1,7 +1,7 @@ # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2011-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index 12f38d2..5fc5459 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -1,9 +1,9 @@ #!/usr/bin/perl -XU # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2011-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/sbin/x2gobroker b/sbin/x2gobroker index c88eb97..0b130d4 100755 --- a/sbin/x2gobroker +++ b/sbin/x2gobroker @@ -2,9 +2,9 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2011-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/sbin/x2gobroker-authservice b/sbin/x2gobroker-authservice index 391211a..d45c84c 100755 --- a/sbin/x2gobroker-authservice +++ b/sbin/x2gobroker-authservice @@ -2,9 +2,9 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2011-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/sbin/x2gobroker-keygen b/sbin/x2gobroker-keygen index e05e4c0..6c1d723 100755 --- a/sbin/x2gobroker-keygen +++ b/sbin/x2gobroker-keygen @@ -2,9 +2,9 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2011-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/sbin/x2gobroker-pubkeyauthorizer b/sbin/x2gobroker-pubkeyauthorizer index f6ebaa4..8c44126 100755 --- a/sbin/x2gobroker-pubkeyauthorizer +++ b/sbin/x2gobroker-pubkeyauthorizer @@ -2,9 +2,9 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2011-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/setup.py b/setup.py index f6d9aba..9fa7ca1 100755 --- a/setup.py +++ b/setup.py @@ -3,9 +3,9 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2012 by Heinz-M. Graesing <heint-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Heinz-M. Graesing <heint-m.graesing(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/src/x2gobroker-agent.c b/src/x2gobroker-agent.c index 0464ae7..0256094 100644 --- a/src/x2gobroker-agent.c +++ b/src/x2gobroker-agent.c @@ -1,8 +1,8 @@ /* * This file is part of the X2Go Project - http://www.x2go.org - * Copyright (C) 2011-2012 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> - * Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> - * Copyright (C) 2012 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> + * Copyright (C) 2011-2013 Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> + * Copyright (C) 2011-2013 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> + * Copyright (C) 2012-2013 Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/x2gobroker/__init__.py b/x2gobroker/__init__.py index d5c3162..a84e978 100644 --- a/x2gobroker/__init__.py +++ b/x2gobroker/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index 35bb6a6..b106dd4 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/authmechs/__init__.py b/x2gobroker/authmechs/__init__.py index 11b7f8f..406cde1 100644 --- a/x2gobroker/authmechs/__init__.py +++ b/x2gobroker/authmechs/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/authmechs/base_authmech.py b/x2gobroker/authmechs/base_authmech.py index 34fede5..5ed362f 100644 --- a/x2gobroker/authmechs/base_authmech.py +++ b/x2gobroker/authmechs/base_authmech.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/authmechs/pam_authmech.py b/x2gobroker/authmechs/pam_authmech.py index a596411..76c0a71 100644 --- a/x2gobroker/authmechs/pam_authmech.py +++ b/x2gobroker/authmechs/pam_authmech.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/authmechs/testsuite_authmech.py b/x2gobroker/authmechs/testsuite_authmech.py index c2aea0b..f8d0a9a 100644 --- a/x2gobroker/authmechs/testsuite_authmech.py +++ b/x2gobroker/authmechs/testsuite_authmech.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/authservice.py b/x2gobroker/authservice.py index bcfc99a..a34a255 100644 --- a/x2gobroker/authservice.py +++ b/x2gobroker/authservice.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2011-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/basicauth.py b/x2gobroker/basicauth.py index f48da4c..ed53f31 100644 --- a/x2gobroker/basicauth.py +++ b/x2gobroker/basicauth.py @@ -1,9 +1,9 @@ #!/usr/bin/env python # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2011-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/brokers/__init__.py b/x2gobroker/brokers/__init__.py index 11b7f8f..406cde1 100644 --- a/x2gobroker/brokers/__init__.py +++ b/x2gobroker/brokers/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/brokers/base_broker.py b/x2gobroker/brokers/base_broker.py index 590087a..2750b43 100644 --- a/x2gobroker/brokers/base_broker.py +++ b/x2gobroker/brokers/base_broker.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/brokers/inifile_broker.py b/x2gobroker/brokers/inifile_broker.py index b9f8a16..7ab229f 100644 --- a/x2gobroker/brokers/inifile_broker.py +++ b/x2gobroker/brokers/inifile_broker.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/brokers/zeroconf_broker.py b/x2gobroker/brokers/zeroconf_broker.py index 6cb83ad..0b953c6 100644 --- a/x2gobroker/brokers/zeroconf_broker.py +++ b/x2gobroker/brokers/zeroconf_broker.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/config.py b/x2gobroker/config.py index 974ad73..2715e1b 100644 --- a/x2gobroker/config.py +++ b/x2gobroker/config.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2010-2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/defaults.py b/x2gobroker/defaults.py index 7d81b76..65b84b4 100644 --- a/x2gobroker/defaults.py +++ b/x2gobroker/defaults.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/loggers.py b/x2gobroker/loggers.py index 2d0963c..1600419 100644 --- a/x2gobroker/loggers.py +++ b/x2gobroker/loggers.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/nameservices/__init__.py b/x2gobroker/nameservices/__init__.py index 11b7f8f..406cde1 100644 --- a/x2gobroker/nameservices/__init__.py +++ b/x2gobroker/nameservices/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/nameservices/base_nameservice.py b/x2gobroker/nameservices/base_nameservice.py index cf05c38..6f825aa 100644 --- a/x2gobroker/nameservices/base_nameservice.py +++ b/x2gobroker/nameservices/base_nameservice.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/nameservices/libnss_nameservice.py b/x2gobroker/nameservices/libnss_nameservice.py index bb4f623..d51bbb7 100644 --- a/x2gobroker/nameservices/libnss_nameservice.py +++ b/x2gobroker/nameservices/libnss_nameservice.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/nameservices/testsuite_nameservice.py b/x2gobroker/nameservices/testsuite_nameservice.py index 90c9b33..32d491f 100644 --- a/x2gobroker/nameservices/testsuite_nameservice.py +++ b/x2gobroker/nameservices/testsuite_nameservice.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/tests/test_broker_base.py b/x2gobroker/tests/test_broker_base.py index 1371724..5c28fda 100644 --- a/x2gobroker/tests/test_broker_base.py +++ b/x2gobroker/tests/test_broker_base.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/tests/test_broker_inifile.py b/x2gobroker/tests/test_broker_inifile.py index 6bc62f8..1e99f7a 100644 --- a/x2gobroker/tests/test_broker_inifile.py +++ b/x2gobroker/tests/test_broker_inifile.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/tests/test_broker_zeroconf.py b/x2gobroker/tests/test_broker_zeroconf.py index 485e8bd..00eb674 100644 --- a/x2gobroker/tests/test_broker_zeroconf.py +++ b/x2gobroker/tests/test_broker_zeroconf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/tests/test_utils.py b/x2gobroker/tests/test_utils.py index 871dca7..2480ffb 100644 --- a/x2gobroker/tests/test_utils.py +++ b/x2gobroker/tests/test_utils.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/tests/test_web_plain_base.py b/x2gobroker/tests/test_web_plain_base.py index dd5a3ba..91f1928 100644 --- a/x2gobroker/tests/test_web_plain_base.py +++ b/x2gobroker/tests/test_web_plain_base.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/tests/test_web_plain_inifile.py b/x2gobroker/tests/test_web_plain_inifile.py index f87f81b..7d48e18 100644 --- a/x2gobroker/tests/test_web_plain_inifile.py +++ b/x2gobroker/tests/test_web_plain_inifile.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/tests/test_web_plain_zeroconf.py b/x2gobroker/tests/test_web_plain_zeroconf.py index 8b98daf..3171e4a 100644 --- a/x2gobroker/tests/test_web_plain_zeroconf.py +++ b/x2gobroker/tests/test_web_plain_zeroconf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/tests/test_web_uccs_zeroconf.py b/x2gobroker/tests/test_web_uccs_zeroconf.py index 6c5d2b5..b796fb5 100644 --- a/x2gobroker/tests/test_web_uccs_zeroconf.py +++ b/x2gobroker/tests/test_web_uccs_zeroconf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/uccsjson.py b/x2gobroker/uccsjson.py index 757dc67..0f81039 100644 --- a/x2gobroker/uccsjson.py +++ b/x2gobroker/uccsjson.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/utils.py b/x2gobroker/utils.py index 0874cf5..83656ec 100644 --- a/x2gobroker/utils.py +++ b/x2gobroker/utils.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/web/__init__.py b/x2gobroker/web/__init__.py index 11b7f8f..406cde1 100644 --- a/x2gobroker/web/__init__.py +++ b/x2gobroker/web/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/web/extras.py b/x2gobroker/web/extras.py index cdb810b..6bce172 100644 --- a/x2gobroker/web/extras.py +++ b/x2gobroker/web/extras.py @@ -1,9 +1,9 @@ #!/usr/bin/env python # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2011-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py index 0607bf2..d3718ec 100644 --- a/x2gobroker/web/plain.py +++ b/x2gobroker/web/plain.py @@ -1,9 +1,9 @@ #!/usr/bin/env python # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2011-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/web/uccs.py b/x2gobroker/web/uccs.py index 041ea81..8422664 100644 --- a/x2gobroker/web/uccs.py +++ b/x2gobroker/web/uccs.py @@ -1,9 +1,9 @@ #!/usr/bin/env python # This file is part of the X2Go Project - http://www.x2go.org -# Copyright (C) 2011-2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> -# Copyright (C) 2011-2012 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2011-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2011-2013 by Heinz-Markus Graesing <heinz-m.graesing(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by diff --git a/x2gobroker/x2gobroker_exceptions.py b/x2gobroker/x2gobroker_exceptions.py index d458419..440b797 100644 --- a/x2gobroker/x2gobroker_exceptions.py +++ b/x2gobroker/x2gobroker_exceptions.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2012 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> -# Copyright (C) 2012 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> +# Copyright (C) 2012-2013 by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> +# Copyright (C) 2012-2013 by Oleksandr Shneyder <oleksandr.shneyder(a)obviously-nice.de> # # X2Go Session Broker is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by 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.2.1-5-g6a16a57
by git-admin＠x2go.org 22 May '13

22 May '13

The branch, master has been updated via 6a16a5739fc702c12d3cc8738837a8a29cae8c12 (commit) from 171e8df1620f71bef0600fe3d8380c8d2a493758 (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 6a16a5739fc702c12d3cc8738837a8a29cae8c12 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed May 22 17:32:18 2013 +0200 release 0.0.2.2 ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f14bb75..e887cc5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -x2gobroker (0.0.2.2-0~x2go1) UNRELEASED; urgency=low +x2gobroker (0.0.2.2-0~x2go1) unstable; urgency=low * New upstream version (0.0.2.2): - Convert unicode type host fields into single element lists. Fix @@ -6,7 +6,7 @@ x2gobroker (0.0.2.2-0~x2go1) UNRELEASED; urgency=low - Correctly incorporate path to x2gobroker-agent.pl into x2gobroker-agent setuid wrapper. (Fixes: #216). - -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 13:12:51 +0200 + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Wed, 22 May 2013 17:32:03 +0200 x2gobroker (0.0.2.1-0~x2go1) unstable; urgency=low 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.2.1-4-g171e8df
by git-admin＠x2go.org 22 May '13

22 May '13

The branch, master has been updated via 171e8df1620f71bef0600fe3d8380c8d2a493758 (commit) from 44fb5f47579b3b2cde8093ce8c05b46e11a13e67 (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 171e8df1620f71bef0600fe3d8380c8d2a493758 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed May 22 17:29:27 2013 +0200 Correctly incorporate path to x2gobroker-agent.pl into x2gobroker-agent setuid wrapper. (Fixes: #216). ----------------------------------------------------------------------- Summary of changes: Makefile | 6 +++--- debian/changelog | 2 ++ debian/rules | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index acfd7b7..cb6a1b8 100755 --- a/Makefile +++ b/Makefile @@ -34,8 +34,8 @@ LDFLAGS += -pie RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= -PREFIX=/usr/local +DESTDIR ?= +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin SBINDIR=$(PREFIX)/sbin @@ -56,7 +56,7 @@ build: build-arch build-indep build-arch: build_setuidwrappers build_setuidwrappers: - $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(DESTDIR)$(LIBDIR)/x2gobroker-agent.pl\" -o lib/x2gobroker-agent src/x2gobroker-agent.c + $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(LIBDIR)/x2gobroker-agent.pl\" -o lib/x2gobroker-agent src/x2gobroker-agent.c build-indep: diff --git a/debian/changelog b/debian/changelog index 0749ee7..f14bb75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ x2gobroker (0.0.2.2-0~x2go1) UNRELEASED; urgency=low * New upstream version (0.0.2.2): - Convert unicode type host fields into single element lists. Fix UCCS+zeroconf tests. + - Correctly incorporate path to x2gobroker-agent.pl into x2gobroker-agent + setuid wrapper. (Fixes: #216). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 13:12:51 +0200 diff --git a/debian/rules b/debian/rules index da48cec..4eb9899 100755 --- a/debian/rules +++ b/debian/rules @@ -22,6 +22,7 @@ #export DEB_CFLAGS_MAINT_APPEND = -Wall #include /usr/share/dpkg/buildflags.mk +export PREFIX=/usr include /usr/share/cdbs/1/rules/debhelper.mk DEB_PYTHON_SYSTEM = $(shell test -f /usr/bin/dh_python2 && echo "" || echo "pysupport") 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

x2goserver.git - master (branch) updated: 3.1.1.3-160-gbd2cfe4
by git-admin＠x2go.org 21 May '13

21 May '13

The branch, master has been updated via bd2cfe47fb1abc96032d22ec65e74b253b9eb7ca (commit) from 31076ba44b343af2616db1e116f10feaa04de08b (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 bd2cfe47fb1abc96032d22ec65e74b253b9eb7ca Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 20 22:12:33 2013 +0200 set prefix in /debian/rules ----------------------------------------------------------------------- Summary of changes: debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) The diff of changes is: diff --git a/debian/rules b/debian/rules index b671ca3..acdd782 100755 --- a/debian/rules +++ b/debian/rules @@ -13,4 +13,4 @@ override_dh_auto_install: override_dh_auto_clean: rm -Rfv x2goserver/.build_html rm -Rfv x2goserver-extensions/.build_html - dh_auto_clean + PREFIX=/usr dh_auto_clean hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

x2goclient.git - master (branch) updated: 4.0.1.0-19-g11af425
by git-admin＠x2go.org 20 May '13

20 May '13

The branch, master has been updated via 11af425a29087773df39806844bff9744cc99182 (commit) from 93f567688f51387af006ab18863ce776a222da0c (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 11af425a29087773df39806844bff9744cc99182 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 20 22:20:49 2013 +0200 Use the session icon as tray icon, pop up notification bubble that informs about current session actions. (Fixes: #177). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ onmainwindow.cpp | 52 +++++++++++++++++++++++++++++++++++++++++++++++++--- onmainwindow.h | 3 +++ 3 files changed, 54 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index cbd012d..1a2a82a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ x2goclient (4.0.1.1-0~x2go1) UNRELEASED; urgency=low * New upstream version (4.0.1.1): - Fix detection of maximum screen area available for a session. (Fixes: #165). + - Use the session icon as tray icon, pop up notification bubble that informs + about current session actions. (Fixes: #177). [ Otto Kjell ] * New upstream version (4.0.1.1): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 435324a..9909dff 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -1430,6 +1430,7 @@ void ONMainWindow::hideEvent(QHideEvent* event) QMainWindow::hideEvent(event); if (event->spontaneous() && trayMinToTray) hide(); + } @@ -3673,7 +3674,7 @@ void ONMainWindow::startNewSession() ( QVariant ) defaultFullscreen ).toBool(); - //if multidisplay = true or maxdim = true we set maximun display area available for the seleccted monitor + //if multidisplay = true or maxdim = true we set maximun display area available for the selected monitor if (st->setting()->value(sid + "/multidisp", (QVariant) false).toBool() || st->setting()->value(sid + "/maxdim", (QVariant) false).toBool()) { int selectedScreen = st->setting()->value(sid + "/display", (QVariant) -1).toInt(); height=QApplication::desktop()->availableGeometry(selectedScreen).height(); @@ -3930,8 +3931,10 @@ void ONMainWindow::startNewSession() sshConnection->executeCommand ( cmd, this, SLOT ( slotRetResumeSess ( bool, QString,int ) ) ); passForm->hide(); -} + //change the trayicon picture + setTrayIconToSessionIcon(tr("Creating new session...")); +} void ONMainWindow::resumeSession ( const x2goSession& s ) @@ -4167,8 +4170,46 @@ void ONMainWindow::resumeSession ( const x2goSession& s ) int ) )); resumingSession=s; passForm->hide(); + + //change the trayicon picture + setTrayIconToSessionIcon(tr("Restoring session...")); + } +/** + * @brief ONMainWindow::setTrayIconToSessionIcon + * @param info: message to be displayed in tray icon message + * + * set the tray session icon picture as tray icon picture and show a tray icon information message about something is doing + * this message avoid the users think nothing is happend for some seconds while x2go session window is showed + * + */ +void ONMainWindow::setTrayIconToSessionIcon(QString info) { + + //set session icon to tray icon + if (trayIcon && lastSession) { + + X2goSettings* st; + + if (!brokerMode) + st=new X2goSettings( "sessions" ); + else + st= new X2goSettings(config.iniFile,QSettings::IniFormat); + + QString sid; + if ( !embedMode ) + sid=lastSession->id(); + else + sid="embedded"; + + QString imagePath = st->setting()->value(sid + "/icon", (QVariant) QString(":icons/128x128/x2go.png")).toString(); + trayIcon->setIcon(QIcon (imagePath)); + + //send a information notification about the connection is done + trayIcon->showMessage(tr("X2Go"), tr ("Established connection\n") + info, QSystemTrayIcon::Information, 15000); + } + +} void ONMainWindow::selectSession ( QStringList& sessions ) { @@ -5281,6 +5322,11 @@ void ONMainWindow::slotProxyError ( QProcess::ProcessError ) void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus ) { + + //set tray icon to default + trayIcon->setIcon(QIcon ( ":icons/128x128/x2go.png") ); + + if ( embedMode ) { if ( proxyWinEmbedded ) @@ -9529,7 +9575,6 @@ void ONMainWindow::resizeProxyWinOnDisplay(int disp) QTimer::singleShot(500, this, SLOT(slotSetProxyWinFullscreen())); } - QRect ONMainWindow::proxyWinGeometry() { #ifdef Q_OS_WIN @@ -9702,6 +9747,7 @@ void ONMainWindow::slotFindProxyWin() else slotAttachProxyWindow(); } + #ifdef Q_OS_WIN x2goDebug<<"Maximize proxy win: "<<maximizeProxyWin; diff --git a/onmainwindow.h b/onmainwindow.h index b736755..86f04ec 100644 --- a/onmainwindow.h +++ b/onmainwindow.h @@ -44,6 +44,7 @@ #include "sshmasterconnection.h" + #ifdef Q_OS_WIN #include <windows.h> #endif @@ -524,6 +525,7 @@ public: } #endif + private: QString m_x2goconfig; QStringList _internApplicationsNames; @@ -894,6 +896,7 @@ private: void removeAppsFromTray(); void plugAppsInTray(); QMenu* initTrayAppMenu(QString text, QPixmap icon); + void setTrayIconToSessionIcon(QString info); protected: 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

x2goserver.git - release/4.0.0.x (branch) updated: 4.0.0.2-2-g2aabac7
by git-admin＠x2go.org 20 May '13

20 May '13

The branch, release/4.0.0.x has been updated via 2aabac70cc2137fe7e0377f6d2ac257841186507 (commit) from 52763c215a1575d7edbebcf482b06267fa82f1cf (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 2aabac70cc2137fe7e0377f6d2ac257841186507 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon May 20 21:52:42 2013 +0200 Make pre-set DESTDIR and PREFIX traverse through all Makefiles. Do not include DESTDIR in Makefile-hard-coded path in x2gosqlitewrapper. ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- debian/changelog | 4 +++- debian/rules | 2 +- x2goserver-compat/Makefile | 4 ++-- x2goserver-extensions/Makefile | 4 ++-- x2goserver-fmbindings/Makefile | 4 ++-- x2goserver-printing/Makefile | 4 ++-- x2goserver-pyhoca/Makefile | 4 ++-- x2goserver-xsession/Makefile | 4 ++-- x2goserver/Makefile | 4 ++-- 10 files changed, 19 insertions(+), 17 deletions(-) The diff of changes is: diff --git a/Makefile b/Makefile index 588084f..3d575cb 100755 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= +DESTDIR ?= PREFIX ?= /usr/local ETCDIR=/etc/x2go LIBDIR=$(PREFIX)/lib/x2go diff --git a/debian/changelog b/debian/changelog index 8990be3..56eb297 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ x2goserver (4.0.0.3-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * New upstream version (4.0.0.3): + - Make pre-set DESTDIR and PREFIX traverse through all Makefiles. + Do not include DESTDIR in Makefile-hard-coded path in x2gosqlitewrapper. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sun, 19 May 2013 15:02:53 +0200 diff --git a/debian/rules b/debian/rules index 5bb94b2..f71ab24 100755 --- a/debian/rules +++ b/debian/rules @@ -10,4 +10,4 @@ override_dh_auto_clean: rm -fv x2gosqlitewrapper rm -Rfv x2goserver/.build_html rm -Rfv x2goserver-extensions/.build_html - dh_auto_clean + PREFIX=/usr dh_auto_clean diff --git a/x2goserver-compat/Makefile b/x2goserver-compat/Makefile index d8a3c95..439ae59 100755 --- a/x2goserver-compat/Makefile +++ b/x2goserver-compat/Makefile @@ -10,8 +10,8 @@ INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= -PREFIX=/usr/local +DESTDIR ?= +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile index 13cf560..cc15e52 100755 --- a/x2goserver-extensions/Makefile +++ b/x2goserver-extensions/Makefile @@ -10,8 +10,8 @@ INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= -PREFIX=/usr/local +DESTDIR ?= +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver-fmbindings/Makefile b/x2goserver-fmbindings/Makefile index 8661e83..ef9a5d3 100755 --- a/x2goserver-fmbindings/Makefile +++ b/x2goserver-fmbindings/Makefile @@ -10,8 +10,8 @@ INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= -PREFIX=/usr/local +DESTDIR ?= +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver-printing/Makefile b/x2goserver-printing/Makefile index 1c956f4..8dc1339 100755 --- a/x2goserver-printing/Makefile +++ b/x2goserver-printing/Makefile @@ -10,8 +10,8 @@ INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= -PREFIX=/usr/local +DESTDIR ?= +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver-pyhoca/Makefile b/x2goserver-pyhoca/Makefile index 95ab06d..1d05bd5 100755 --- a/x2goserver-pyhoca/Makefile +++ b/x2goserver-pyhoca/Makefile @@ -10,8 +10,8 @@ INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= -PREFIX=/usr/local +DESTDIR ?= +PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver-xsession/Makefile b/x2goserver-xsession/Makefile index 50c2818..6ce7beb 100755 --- a/x2goserver-xsession/Makefile +++ b/x2goserver-xsession/Makefile @@ -11,8 +11,8 @@ INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= -PREFIX=/usr/local +DESTDIR ?= +PREFIX ?= /usr/local ETCDIR=/etc/x2go #BINDIR=$(PREFIX)/bin #SBINDIR=$(PREFIX)/sbin diff --git a/x2goserver/Makefile b/x2goserver/Makefile index e9d56e6..d324bc5 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -14,7 +14,7 @@ INSTALL_PROGRAM=install -o root -g root -m 755 RM_FILE=rm -f RM_DIR=rmdir -p --ignore-fail-on-non-empty -DESTDIR= +DESTDIR ?= PREFIX ?= /usr/local ETCDIR=/etc/x2go BINDIR=$(PREFIX)/bin @@ -41,7 +41,7 @@ build: build-arch build-indep build-arch: build_setgidwrappers build_setgidwrappers: - $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(DESTDIR)$(LIBDIR)/x2gosqlitewrapper.pl\" -o x2gosqlitewrapper x2gosqlitewrapper.c + $(CC) $(CFLAGS) $(LDFLAGS) -DTRUSTED_BINARY=\"$(LIBDIR)/x2gosqlitewrapper.pl\" -o x2gosqlitewrapper x2gosqlitewrapper.c build-indep: build_man2html hooks/post-receive -- x2goserver.git (X2Go Server) 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 "x2goserver.git" (X2Go Server).

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits