x2go-commits November 2012

x2go-commits@lists.x2go.org

1 participants
327 discussions

pyhoca-gui.git - master (branch) updated: 0.2.0.4-47-ga6bbb96
by git-admin＠x2go.org 02 Nov '12

02 Nov '12

The branch, master has been updated via a6bbb96a2533efb7a31d77d6fe2693796cd9e87a (commit) from 6a54d5625b423a01a52b5e5882203195e51cd794 (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 a6bbb96a2533efb7a31d77d6fe2693796cd9e87a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 2 23:25:21 2012 +0100 old refresh session list if we actually fiddled around with running pubapp sessions ----------------------------------------------------------------------- Summary of changes: man/man1/pyhoca-gui.1 | 6 ++++++ pyhoca-gui | 1 + pyhoca/wxgui/frontend.py | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/man/man1/pyhoca-gui.1 b/man/man1/pyhoca-gui.1 index 1f73aff..8ca7b2e 100644 --- a/man/man1/pyhoca-gui.1 +++ b/man/man1/pyhoca-gui.1 @@ -149,6 +149,12 @@ Give a custom position for the logon window, use negative values to position rel .TP \*(T<\fB\-\-published-applications-no-submenus\fR \fI<number>\fR\*(T> The number of published applications that will be rendered without submenus. +.TP +\*(T<\fB\-\-connection-timeout\fR \fI<secs>\fR\*(T> +Python X2Go (the X2Go backend in PyHoca-GUI) regularly pings the aliveness of each X2Go server that the +application is connected to. If these pings receive a connection timeout, Python X2Go interprets this as +a connection loss. The default connection timeout is 20 seconds. If this does not meet your requirements +you can scale the timeout value to your needs. .PP .SH BACKEND OPTIONS \fBpyhoca-gui\fR supports transparent use of different data backends. For configuration three backends are common: diff --git a/pyhoca-gui b/pyhoca-gui index 0486314..2f4a7aa 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -223,6 +223,7 @@ x2go_gui_options = [ {'args':['--display'], 'default': None, 'metavar': '<hostname>:<screennumber>', 'help': 'set the DISPLAY environment variable to <hostname>:<screennumber>', }, {'args':['--logon-window-position'], 'default': None, 'metavar': '<x-pos>x<y-pos>', 'help': 'give a custom position for the logon window, use negative values to position relative to right/bottom border', }, {'args':['--published-applications-no-submenus'], 'default': 10, 'metavar': '<number>', 'help': 'the number of published applications that will be rendered without submenus', }, + {'args':['--connection-timeout'], 'default': 20, 'metavar': '<secs>', 'help': 'timeout connection after <secs> seconds (default: 20)', }, ] if _X2GOCLIENT_OS == 'Windows': x2go_gui_options.append( diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index dcfe28a..e5b9a95 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -518,7 +518,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): # be one) if pubapp_sessions_running: gevent.sleep(1) - session_list = self._X2goClient__list_sessions(session_uuid=session_uuid, profile_name=profile_name, refresh_cache=True) + session_list = self._X2goClient__list_sessions(session_uuid=session_uuid, profile_name=profile_name, refresh_cache=True) if session_list: pubapp_sessions_suspended = [ _sn for _sn in session_list.keys() if session_list[_sn].is_suspended() and session_list[_sn].is_published_applications_provider() ] hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

pyhoca-gui.git - master (branch) updated: 0.2.0.4-46-g6a54d56
by git-admin＠x2go.org 02 Nov '12

02 Nov '12

The branch, master has been updated via 6a54d5625b423a01a52b5e5882203195e51cd794 (commit) from 76f5cc8bdb1b7a0dfe63a516df806d557320266a (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 6a54d5625b423a01a52b5e5882203195e51cd794 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 2 23:17:31 2012 +0100 Make pub app session startup more robust. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + pyhoca/wxgui/frontend.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index da70aa1..f416779 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,7 @@ pyhoca-gui (0.2.1.0-0~x2go1) UNRELEASED; urgency=low request forwarding in session profile manager. - Add SSH agent README. - Rename session type XFCE4 to XFCE (using an unversioned session type name). + - Make pub app session startup more robust. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev(a)lists.berlios.de>. diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 5f8821b..dcfe28a 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -498,6 +498,8 @@ class PyHocaGUI(wx.App, x2go.X2goClient): if profile_name not in self._temp_launching_pubapp_profiles: self._temp_launching_pubapp_profiles.append(profile_name) + else: + return None pubapp_session_started = False pubapp_session_resumed = False @@ -516,7 +518,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient): # be one) if pubapp_sessions_running: gevent.sleep(1) - session_list = self._X2goClient__list_sessions(session_uuid=session_uuid, profile_name=profile_name, refresh_cache=True) + session_list = self._X2goClient__list_sessions(session_uuid=session_uuid, profile_name=profile_name, refresh_cache=True) if session_list: pubapp_sessions_suspended = [ _sn for _sn in session_list.keys() if session_list[_sn].is_suspended() and session_list[_sn].is_published_applications_provider() ] hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) 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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).

1 0

python-paramiko.git - master (branch) updated: 786920a3208fa335f334689d65b7302e9d52a568
by git-admin＠x2go.org 02 Nov '12

02 Nov '12

The branch, master has been updated via 786920a3208fa335f334689d65b7302e9d52a568 (commit) via dfb45dec7fac59559009cac16d9b354ef4890de3 (commit) via 7c12862b55224faea75758ceef78135fa9119df2 (commit) via 1341e28882998a08fa2bf00c21047207dff3e18a (commit) via 78815afe9db56846279ceee5af3863c0ee16e9b8 (commit) via 8e5f774965bc281b8154379f68e6152356eedfd8 (commit) via 45969670db14401819958dd46fa72b904c3bd8cc (commit) via e99399ce6683aa137cdc8199407fb8673a345cca (commit) via e3ab0489f3ea6eef767818d3427ba6f08362f0ef (commit) from 09488c665ba46057648a13a12c76f0c6392a86a1 (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: NEWS | 21 +++++++++++++++++++-- fabfile.py | 13 +++++++++++++ paramiko/sftp_client.py | 4 ++-- tests/test_buffered_pipe.py | 8 +++----- tests/test_transport.py | 7 ++----- tests/test_util.py | 13 ++----------- tests/util.py | 10 ++++++++++ 7 files changed, 51 insertions(+), 25 deletions(-) create mode 100644 fabfile.py create mode 100644 tests/util.py The diff of changes is: diff --git a/NEWS b/NEWS index 37739c6..ed9fd00 100644 --- a/NEWS +++ b/NEWS @@ -12,8 +12,25 @@ Issues noted as "Fabric #NN" can be found at https://github.com/fabric/fabric/. Releases ======== -v1.8.0 <DATE> ---------------- +v1.9.0 (DD MM YYYY) +------------------- + + +v1.8.1 (DD MM YYYY) +------------------- + +* #90: Ensure that callbacks handed to `SFTPClient.get()` always fire at least + once, even for zero-length files downloaded. Thanks to Github user `@enB` for + the catch. +* #85: Paramiko's test suite overrides + `unittest.TestCase.assertTrue/assertFalse` to provide these modern assertions + to Python 2.2/2.3, which lacked them. However on newer Pythons such as 2.7, + this now causes deprecation warnings. The overrides have been patched to only + execute when necessary. Thanks to `@Arfrever` for catch & patch. + + +v1.8.0 (3rd Oct 2012) +--------------------- * 'ssh' 32: Raise a more useful error explaining which `known_hosts` key line was problematic, when encountering `binascii` issues decoding known host keys. diff --git a/fabfile.py b/fabfile.py new file mode 100644 index 0000000..29394f9 --- /dev/null +++ b/fabfile.py @@ -0,0 +1,13 @@ +from fabric.api import task, sudo, env +from fabric.contrib.project import rsync_project + + +@task +def upload_docs(): + target = "/var/www/paramiko.org" + staging = "/tmp/paramiko_docs" + sudo("mkdir -p %s" % staging) + sudo("chown -R %s %s" % (env.user, staging)) + sudo("rm -rf %s/*" % target) + rsync_project(local_dir='docs/', remote_dir=staging, delete=True) + sudo("cp -R %s/* %s/" % (staging, target)) diff --git a/paramiko/sftp_client.py b/paramiko/sftp_client.py index f446ba3..3eaefc9 100644 --- a/paramiko/sftp_client.py +++ b/paramiko/sftp_client.py @@ -612,12 +612,12 @@ class SFTPClient (BaseSFTP): size = 0 while True: data = fr.read(32768) - if len(data) == 0: - break fl.write(data) size += len(data) if callback is not None: callback(size, file_size) + if len(data) == 0: + break finally: fl.close() finally: diff --git a/tests/test_buffered_pipe.py b/tests/test_buffered_pipe.py index f285d05..b9d91f6 100644 --- a/tests/test_buffered_pipe.py +++ b/tests/test_buffered_pipe.py @@ -26,6 +26,8 @@ import unittest from paramiko.buffered_pipe import BufferedPipe, PipeTimeout from paramiko import pipe +from util import ParamikoTest + def delay_thread(pipe): pipe.feed('a') @@ -39,11 +41,7 @@ def close_thread(pipe): pipe.close() -class BufferedPipeTest (unittest.TestCase): - - assertTrue = unittest.TestCase.failUnless # for Python 2.3 and below - assertFalse = unittest.TestCase.failIf # for Python 2.3 and below - +class BufferedPipeTest(ParamikoTest): def test_1_buffered_pipe(self): p = BufferedPipe() self.assert_(not p.read_ready()) diff --git a/tests/test_transport.py b/tests/test_transport.py index cea4a1d..1c57d18 100644 --- a/tests/test_transport.py +++ b/tests/test_transport.py @@ -36,6 +36,7 @@ from paramiko import OPEN_SUCCEEDED, OPEN_FAILED_ADMINISTRATIVELY_PROHIBITED from paramiko.common import MSG_KEXINIT, MSG_CHANNEL_WINDOW_ADJUST from paramiko.message import Message from loop import LoopSocket +from util import ParamikoTest LONG_BANNER = """\ @@ -105,11 +106,7 @@ class NullServer (ServerInterface): return OPEN_SUCCEEDED -class TransportTest (unittest.TestCase): - - assertTrue = unittest.TestCase.failUnless # for Python 2.3 and below - assertFalse = unittest.TestCase.failIf # for Python 2.3 and below - +class TransportTest(ParamikoTest): def setUp(self): self.socks = LoopSocket() self.sockc = LoopSocket() diff --git a/tests/test_util.py b/tests/test_util.py index 7e56245..458709b 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -28,6 +28,7 @@ import unittest from Crypto.Hash import SHA import paramiko.util +from util import ParamikoTest test_config_file = """\ Host * @@ -58,17 +59,7 @@ BGQ3GQ/Fc7SX6gkpXkwcZryoi4kNFhHu5LvHcZPdxXV1D+uTMfGS1eyd2Yz/DoNWXNAl8TI0cAsW\ from paramiko import * -class UtilTest (unittest.TestCase): - - assertTrue = unittest.TestCase.failUnless # for Python 2.3 and below - assertFalse = unittest.TestCase.failIf # for Python 2.3 and below - - def setUp(self): - pass - - def tearDown(self): - pass - +class UtilTest(ParamikoTest): def test_1_import(self): """ verify that all the classes can be imported from paramiko. diff --git a/tests/util.py b/tests/util.py new file mode 100644 index 0000000..2e0be08 --- /dev/null +++ b/tests/util.py @@ -0,0 +1,10 @@ +import unittest + + +class ParamikoTest(unittest.TestCase): + # for Python 2.3 and below + if not hasattr(unittest.TestCase, 'assertTrue'): + assertTrue = unittest.TestCase.failUnless + if not hasattr(unittest.TestCase, 'assertFalse'): + assertFalse = unittest.TestCase.failIf + hooks/post-receive -- python-paramiko.git (Debian package python-paramiko) 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-paramiko.git" (Debian package python-paramiko).

1 0

python-paramiko.git - local (branch) created: a9ba92492b6c98d199a816baec9ffd3377010a12
by git-admin＠x2go.org 02 Nov '12

02 Nov '12

The branch, local has been created at a9ba92492b6c98d199a816baec9ffd3377010a12 (commit) - Log ----------------------------------------------------------------- commit a9ba92492b6c98d199a816baec9ffd3377010a12 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Oct 12 09:51:18 2012 +0200 do not write ,,garbage'' to known_hosts file(s) commit cba9fe75d655320ddadbf665879ad1973d501ee0 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Oct 12 09:50:51 2012 +0200 Load host entries from the known_hosts file(s) before writing the file from RAM to disk. Avoids loss of host entries in case other SSH clients have written to the known_hosts file(s) meanwhile. commit 3ecb9ecd0850ddde368eb39775b3e142e0650548 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Oct 12 09:41:52 2012 +0200 Assure that host entries in known_hosts files do not duplicate endlessly if keys from known_hosts are loaded via HostKeys.load() more than once (e.g. for refreshing the list of known hosts during runtime). commit f0cf033069f4c8b3ae9f209136596e5e66c41753 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Oct 12 09:36:42 2012 +0200 Store hostname hashes in memory rathen than the non-hashed host entries. Also assures that the host entries in known_hosts get saved in hashed format as it is currently standard in OpenSSH. ----------------------------------------------------------------------- hooks/post-receive -- python-paramiko.git (Debian package python-paramiko) 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-paramiko.git" (Debian package python-paramiko).

1 0

python-paramiko.git - sunweaver (branch) created: f5a286289df1d5f9fbd3c458f9379c571d496df9
by git-admin＠x2go.org 02 Nov '12

02 Nov '12

The branch, sunweaver has been created at f5a286289df1d5f9fbd3c458f9379c571d496df9 (commit) - Log ----------------------------------------------------------------- commit f5a286289df1d5f9fbd3c458f9379c571d496df9 Merge: 72ba33e 786920a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Nov 2 22:41:00 2012 +0100 Merge branch 'master' into sunweaver commit 786920a3208fa335f334689d65b7302e9d52a568 Merge: 78815af dfb45de Author: Jeff Forcier <jeff(a)bitprophet.org> Date: Mon Oct 15 13:33:16 2012 -0700 Merge branch '1.8' commit dfb45dec7fac59559009cac16d9b354ef4890de3 Author: Jeff Forcier <jeff(a)bitprophet.org> Date: Mon Oct 15 13:21:58 2012 -0700 Refactoring: it's a thing. Re #85 commit 7c12862b55224faea75758ceef78135fa9119df2 Author: Jeff Forcier <jeff(a)bitprophet.org> Date: Mon Oct 15 12:57:39 2012 -0700 Only override unittest assertions when absolutely necessary. Fixes #85 commit 1341e28882998a08fa2bf00c21047207dff3e18a Author: Jeff Forcier <jeff(a)bitprophet.org> Date: Sun Oct 14 21:46:50 2012 -0700 Move SFTPClient.get() termination condition to loop end. Ensures callback always executes even for zero-len files. Fixes #90 commit 78815afe9db56846279ceee5af3863c0ee16e9b8 Merge: 4596967 8e5f774 Author: Jeff Forcier <jeff(a)bitprophet.org> Date: Sun Oct 14 20:40:59 2012 -0700 Merge branch '1.8' Conflicts: NEWS commit 8e5f774965bc281b8154379f68e6152356eedfd8 Author: Jeff Forcier <jeff(a)bitprophet.org> Date: Sun Oct 14 20:40:39 2012 -0700 Meh fabfile for docs uploading commit 45969670db14401819958dd46fa72b904c3bd8cc Author: Jeff Forcier <jeff(a)bitprophet.org> Date: Sun Oct 14 17:06:36 2012 -0700 Add 1.9.0 to master NEWS commit e99399ce6683aa137cdc8199407fb8673a345cca Author: Jeff Forcier <jeff(a)bitprophet.org> Date: Sun Oct 14 17:05:18 2012 -0700 Set up 1.8.1 chunk in NEWS commit e3ab0489f3ea6eef767818d3427ba6f08362f0ef Author: Jeff Forcier <jeff(a)bitprophet.org> Date: Sun Oct 14 17:03:47 2012 -0700 Add missing release date to NEWS for 1.8.0 commit 72ba33ecb63556d482153c3f6451b551740be9de Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Oct 12 09:51:18 2012 +0200 do not write ,,garbage'' to known_hosts file(s) commit 5e10b4ee6b5160d5f5cb83f558c39cea15947cff Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Oct 12 09:50:51 2012 +0200 Load host entries from the known_hosts file(s) before writing the file from RAM to disk. Avoids loss of host entries in case other SSH clients have written to the known_hosts file(s) meanwhile. commit b9987c1fafe4668535b305f2d6780d9a6187dc50 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Oct 12 09:41:52 2012 +0200 Assure that host entries in known_hosts files do not duplicate endlessly if keys from known_hosts are loaded via HostKeys.load() more than once (e.g. for refreshing the list of known hosts during runtime). commit c36e3d142290ccb9ab6829614cb35491e6fc7df5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Fri Oct 12 09:36:42 2012 +0200 Store hostname hashes in memory rathen than the non-hashed host entries. Also assures that the host entries in known_hosts get saved in hashed format as it is currently standard in OpenSSH. ----------------------------------------------------------------------- hooks/post-receive -- python-paramiko.git (Debian package python-paramiko) 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-paramiko.git" (Debian package python-paramiko).

1 0

x2goclient2.git - master (branch) updated: af679ed1fd34a7a062902d8b3960efe0dcfd62f8
by git-admin＠x2go.org 02 Nov '12

02 Nov '12

The branch, master has been updated via af679ed1fd34a7a062902d8b3960efe0dcfd62f8 (commit) from eafb95dd5e274e0d74c2c2a47126cdd7c300b2ae (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 af679ed1fd34a7a062902d8b3960efe0dcfd62f8 Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> Date: Fri Nov 2 12:32:27 2012 +0100 remove some memory leaks ----------------------------------------------------------------------- Summary of changes: main.cpp | 2 +- mainwindow.cpp | 2 +- profiledetailconfiguratorform.cpp | 2 +- svgframe.cpp | 2 +- x2goapplication.cpp | 3 ++- x2gobroker.cpp | 12 ++++++++++++ x2gobroker.h | 1 + 7 files changed, 19 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/main.cpp b/main.cpp index c4184cc..c3d7dae 100644 --- a/main.cpp +++ b/main.cpp @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) } else { - new MainWindow; + MainWindow m; return app.exec(); } return 0; diff --git a/mainwindow.cpp b/mainwindow.cpp index b961fb4..1590319 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -26,6 +26,7 @@ #include <QFrame> #include <QVBoxLayout> #include <QResizeEvent> +#include <QDebug> #include "workarea.h" #include "svgframe.h" #include "x2goapplication.h" @@ -43,7 +44,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags): QMainWindow(pare MainWindow::~MainWindow() { - } void MainWindow::resizeEvent(QResizeEvent* event) diff --git a/profiledetailconfiguratorform.cpp b/profiledetailconfiguratorform.cpp index 3adc4a9..1ce8e09 100644 --- a/profiledetailconfiguratorform.cpp +++ b/profiledetailconfiguratorform.cpp @@ -51,7 +51,7 @@ ProfileDetailConfiguratorForm::ProfileDetailConfiguratorForm(QWidget* parent, Qt pbApply->setIcon(QIcon(":/trolltech/styles/commonstyle/images/standardbutton-apply-16.png")); pbOk->setIcon(QIcon(":/trolltech/styles/commonstyle/images/standardbutton-ok-16.png")); pbReset->setIcon(QIcon(":/trolltech/styles/commonstyle/images/standardbutton-clear-16.png")); - scrollArea->takeWidget(); + delete scrollArea->takeWidget(); } ProfileDetailConfiguratorForm::~ProfileDetailConfiguratorForm() diff --git a/svgframe.cpp b/svgframe.cpp index 3fb82fb..71db116 100644 --- a/svgframe.cpp +++ b/svgframe.cpp @@ -51,7 +51,7 @@ void SVGFrame::renderBackground() QPainter p ( &img ); if ( p.isActive() ) renderer->render ( &p ); - pal.setBrush ( QPalette::Window,QBrush ( QPixmap::fromImage ( img ) ) ); + pal.setBrush ( QPalette::Window,QBrush ( img ) ); setPalette ( pal ); } diff --git a/x2goapplication.cpp b/x2goapplication.cpp index eaa249a..1fd8881 100644 --- a/x2goapplication.cpp +++ b/x2goapplication.cpp @@ -101,13 +101,14 @@ void X2GoApplication::slotInitApplication() mainWindow->show(); clientConfig->get_disallowSessionEdit().set_value((QVariant)true); broker=new X2GoBroker(); + if(broker->get_brokerAbort()) + return; connect(broker, SIGNAL(signalSessionsLoaded()), this, SLOT(slotBrokerSessionsConfig())); broker->getUserSessions(); } if(clientConfig->get_disallowSessionEdit().get_value().toBool()) { profileSettingsForm->hide(); - qDebug()<<"hide sttings"; } } diff --git a/x2gobroker.cpp b/x2gobroker.cpp index 714ce11..0cd2152 100644 --- a/x2gobroker.cpp +++ b/x2gobroker.cpp @@ -30,6 +30,9 @@ X2GoBroker::X2GoBroker(QObject* parent): QObject(parent) { http=0; + sessionsRequest=-1; + selSessRequest=-1; + brokerAbort=false; X2GoClientConfig* cfg=X2GoApplication::instance()->get_clientConfig(); QString urlString=cfg->get_brokerUrl().get_value().toString(); url = QUrl( urlString); @@ -60,6 +63,7 @@ X2GoBroker::X2GoBroker(QObject* parent): QObject(parent) if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { MessageBox::critical(tr("Can't open file")+" - "+cfg->get_authId().get_value().toString(), MessageBox::OK); + brokerAbort=true; X2GoApplication::exit(-1); } QTextStream in(&file); @@ -83,12 +87,18 @@ void X2GoBroker::getLoginData() { MessageBox::Buttons res=MessageBox::input(tr("Enter user name for authentication on broker"),tr("User:"),user); if(res!=MessageBox::OK) + { + brokerAbort=true; X2GoApplication::exit(-1); + } } pass=QString::null; MessageBox::Buttons res=MessageBox::input(tr("Enter password for authentication on broker"),tr("Password:"),pass, QLineEdit::Password); if(res!=MessageBox::OK) + { + brokerAbort=true; X2GoApplication::exit(-1); + } } @@ -294,3 +304,5 @@ QString X2GoBroker::getHexVal(const QByteArray& ba) return val.join ( ":" ); } + + diff --git a/x2gobroker.h b/x2gobroker.h index 68dee95..49e3248 100644 --- a/x2gobroker.h +++ b/x2gobroker.h @@ -33,6 +33,7 @@ class QHttp; class X2GoBroker : public QObject { X2GO_RO_PROPERTY(QString, sessionsConfig) + X2GO_RO_PROPERTY(bool, brokerAbort) Q_OBJECT public: explicit X2GoBroker(QObject* parent = 0); hooks/post-receive -- x2goclient2.git (X2Go Client 2 (rewrite of x2goclient.git)) 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 "x2goclient2.git" (X2Go Client 2 (rewrite of x2goclient.git)).

1 0

x2goclient2.git - master (branch) updated: eafb95dd5e274e0d74c2c2a47126cdd7c300b2ae
by git-admin＠x2go.org 01 Nov '12

01 Nov '12

The branch, master has been updated via eafb95dd5e274e0d74c2c2a47126cdd7c300b2ae (commit) from fc019c57e118c79e8406dbe613f55f11e4c9beac (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 eafb95dd5e274e0d74c2c2a47126cdd7c300b2ae Author: Oleksandr Shneyder <o.shneyder(a)phoca-gmbh.de> Date: Thu Nov 1 13:22:54 2012 +0100 disable session editing if config option disallowSessionEdit is "true" ----------------------------------------------------------------------- Summary of changes: profile.cpp | 27 ++++++--- workarea.cpp | 17 ++++-- x2goapplication.cpp | 11 +++- x2goapplication.h | 4 ++ x2goclientconfig.h | 148 +++++++++++++++++++++++----------------------- x2goclientconfigdetail.h | 3 +- 6 files changed, 118 insertions(+), 92 deletions(-) The diff of changes is: diff --git a/profile.cpp b/profile.cpp index 8d2c8cd..199bb29 100644 --- a/profile.cpp +++ b/profile.cpp @@ -157,17 +157,25 @@ void Profile::slotUpdateProfileWidget() } else { - setFixedWidth(scrollAreaWidget->width()-20); - if(!f2SettingsConnector) + if(! X2GoApplication::instance()->get_clientConfig()->get_disallowSessionEdit().get_value().toBool()) { - f2SettingsConnector=new QFrame(this); - f2SettingsConnector->setFixedSize(30,PROFILE_HEIGHT); - f2SettingsConnector->setAutoFillBackground(true); - f2SettingsConnector->setStyleSheet("border-image: url(:svg/profile2settingsconnector.svg)"); - f2SettingsConnector->setMouseTracking(false); + setFixedWidth(scrollAreaWidget->width()-20); + if(!f2SettingsConnector) + { + f2SettingsConnector=new QFrame(this); + f2SettingsConnector->setFixedSize(30,PROFILE_HEIGHT); + f2SettingsConnector->setAutoFillBackground(true); + f2SettingsConnector->setStyleSheet("border-image: url(:svg/profile2settingsconnector.svg)"); + f2SettingsConnector->setMouseTracking(false); + } + f2SettingsConnector->move(width()-30,0); + f2SettingsConnector->show(); } - f2SettingsConnector->move(width()-30,0); - f2SettingsConnector->show(); + else + { + setFixedWidth(scrollAreaWidget->width()-25); + } + } show(); if(X2GoApplication::instance()->get_workArea()->getScrollArea()->horizontalScrollBar()->value() > @@ -204,6 +212,7 @@ void Profile::initWidget() border-right: 0px transparent; border-left: 0px transparent"); connect(pbSettings, SIGNAL(clicked(bool)), this, SLOT(slotSelectProfile())); connect(pbSettings, SIGNAL(clicked(bool)), X2GoApplication::instance()->get_workArea(), SLOT(slotScrollToProfileSettingsForm())); + pbSettings->setDisabled(X2GoApplication::instance()->get_clientConfig()->get_disallowSessionEdit().get_value().toBool()); updateProfileDetails(); } diff --git a/workarea.cpp b/workarea.cpp index baf4317..eb23c8b 100644 --- a/workarea.cpp +++ b/workarea.cpp @@ -28,6 +28,7 @@ #include "profilesettingsform.h" #include "profiledetailconfiguratorform.h" #include "searchbar.h" +#include "x2goclientconfig.h" #include <QDebug> #include <QPushButton> #include "x2goapplication.h" @@ -49,11 +50,10 @@ WorkArea::WorkArea(QWidget* parent, Qt::WindowFlags f): QWidget( parent, f) lay->addWidget(profileForm= new ProfileForm(scrollWidget)); lay->addWidget(profileSettingsForm= new ProfileSettingsForm(scrollWidget)); lay->addWidget(profileDetailConfiguratorForm= new ProfileDetailConfiguratorForm(scrollWidget)); - + scrollArea->setFocusPolicy(Qt::NoFocus); scrollWidget->setFocusPolicy(Qt::NoFocus); - sessionForm->hide(); X2GoApplication::instance()->set_sessionForm(sessionForm); X2GoApplication::instance()->set_profileForm(profileForm); X2GoApplication::instance()->set_profileSettingsForm(profileSettingsForm); @@ -72,10 +72,15 @@ void WorkArea::slotResizeChildForms() { if(profileForm && sessionForm && profileSettingsForm) { - profileForm->setFixedSize(scrollArea->viewport()->width()-10, scrollArea->viewport()->height()); - profileSettingsForm->setFixedSize(scrollArea->viewport()->size().width()-35, scrollArea->viewport()->size().height()); + if(X2GoApplication::instance()->get_clientConfig()->get_disallowSessionEdit().get_value().toBool()) + profileForm->setFixedSize(scrollArea->viewport()->size()); + else + { + profileForm->setFixedSize(scrollArea->viewport()->width()-10, scrollArea->viewport()->height()); + profileSettingsForm->setFixedSize(scrollArea->viewport()->size().width()-35, scrollArea->viewport()->size().height()); + profileDetailConfiguratorForm->setFixedSize(scrollArea->viewport()->size()); + } sessionForm->setFixedSize(scrollArea->viewport()->size().width()-90, scrollArea->viewport()->size().height()); - profileDetailConfiguratorForm->setFixedSize(scrollArea->viewport()->size()); animateNextScroll=false; QTimer::singleShot(100, this, SLOT(slotScrollChildForms())); } @@ -124,7 +129,7 @@ void WorkArea::slotScrollChildForms() { scrollArea->horizontalScrollBar()->setValue(formToScroll->x()); X2GoApplication::instance()->updateProfiles(); - animateNextScroll=true; + animateNextScroll=true; } else { diff --git a/x2goapplication.cpp b/x2goapplication.cpp index 8abe77f..eaa249a 100644 --- a/x2goapplication.cpp +++ b/x2goapplication.cpp @@ -33,6 +33,7 @@ #include "helpdialog.h" #include "mainwindow.h" #include "x2gobroker.h" +#include "profilesettingsform.h" X2GoApplication::X2GoApplication(int& argc, char** argv, int flags): QApplication(argc, argv, flags) { @@ -98,10 +99,16 @@ void X2GoApplication::slotInitApplication() else { mainWindow->show(); + clientConfig->get_disallowSessionEdit().set_value((QVariant)true); broker=new X2GoBroker(); - connect(broker, SIGNAL(signalSessionsLoaded()), this, SLOT(slotBrokerSessionsConfig())); + connect(broker, SIGNAL(signalSessionsLoaded()), this, SLOT(slotBrokerSessionsConfig())); broker->getUserSessions(); } + if(clientConfig->get_disallowSessionEdit().get_value().toBool()) + { + profileSettingsForm->hide(); + qDebug()<<"hide sttings"; + } } void X2GoApplication::slotBrokerSessionsConfig() @@ -172,6 +179,8 @@ void X2GoApplication::initProfiles() profiles<<(Profile*)psrt.ptr; } emit signalUpdateProfiles(); + if(profiles.size()>0) + profiles[0]->slotSelectProfile(); } void X2GoApplication::updateProfiles() diff --git a/x2goapplication.h b/x2goapplication.h index 0f0b543..2cddbd9 100644 --- a/x2goapplication.h +++ b/x2goapplication.h @@ -29,8 +29,12 @@ public: TYPE get_##NAME(){return NAME;} #define X2GO_RO_PROPERTY(TYPE,NAME) private: TYPE NAME; \ public: TYPE get_##NAME(){return NAME;} +#define X2GO_RO_PROPERTY_REF(TYPE,NAME) private: TYPE NAME; \ +public: TYPE& get_##NAME(){return NAME;} + #define X2GO_PROPERTY_GETTER(TYPE,NAME) public: TYPE get_##NAME(){return NAME;} + class SessionForm; class WorkArea; class ProfileForm; diff --git a/x2goclientconfig.h b/x2goclientconfig.h index 3b750c9..bd2d1ec 100644 --- a/x2goclientconfig.h +++ b/x2goclientconfig.h @@ -29,80 +29,80 @@ class X2GoClientConfig: public QObject { - X2GO_RO_PROPERTY(X2GoClientConfigDetail, printShowDialog) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, printPDFView) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, printCustomCommand) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, printCommand) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, printStdin) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, printPS) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, printViewOpen) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, printViewCommand) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, printCUPSDefaultPrinter) - - X2GO_RO_PROPERTY(X2GoClientConfigDetail, showStatusBar) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, clientSSHPort) - - X2GO_RO_PROPERTY(X2GoClientConfigDetail, trayEnabled) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, trayMinimize) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, trayHideOnClose) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, trayHideOnConnect) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, trayShowOnDisconnect) - - X2GO_RO_PROPERTY(X2GoClientConfigDetail, windowSize) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, windowPosition) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, windowShowMaximized) - - X2GO_RO_PROPERTY(X2GoClientConfigDetail, showHelp) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, showHelpPack) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, portableMode) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, cleanFilesOnExit) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, hideMenu) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultXinerama) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, thinClientMode) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, showHaltButton) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, startHidden) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, usePGPCard) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, autoAddToKnownHosts) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, disallowSessionEdit) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultAutoLogin) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultBrockerAutoLogin) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultNoBrockerAuth) - - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultDpi) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultLink) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultSpeed) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultPack) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultPackMethod) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultPackQuality) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultSound) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultSessionGeometry) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultSessionGeometryFullScreen) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultSessionGeometryWidth) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultSessionGeometryHeight) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultKbdLayout) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultKbdType) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultChangeKbd) - - X2GO_RO_PROPERTY(X2GoClientConfigDetail, sessionConfigFile) - - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultSessionName) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultSessionId) - - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultUserName) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultSessionCommand) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultSSHPort) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, defaultSSHKey) - - X2GO_RO_PROPERTY(X2GoClientConfigDetail, brokerUrl) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, brokerSSHKey) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, brokerName) - X2GO_RO_PROPERTY(X2GoClientConfigDetail, authId) - - X2GO_RO_PROPERTY(X2GoClientConfigDetail, autoStartApp) - - X2GO_RO_PROPERTY(X2GoClientConfigDetail, homeDirectory) - - X2GO_RO_PROPERTY(X2GoClientConfigDetail, readExportsFrom) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, printShowDialog) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, printPDFView) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, printCustomCommand) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, printCommand) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, printStdin) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, printPS) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, printViewOpen) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, printViewCommand) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, printCUPSDefaultPrinter) + + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, showStatusBar) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, clientSSHPort) + + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, trayEnabled) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, trayMinimize) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, trayHideOnClose) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, trayHideOnConnect) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, trayShowOnDisconnect) + + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, windowSize) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, windowPosition) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, windowShowMaximized) + + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, showHelp) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, showHelpPack) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, portableMode) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, cleanFilesOnExit) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, hideMenu) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultXinerama) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, thinClientMode) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, showHaltButton) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, startHidden) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, usePGPCard) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, autoAddToKnownHosts) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, disallowSessionEdit) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultAutoLogin) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultBrockerAutoLogin) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultNoBrockerAuth) + + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultDpi) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultLink) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultSpeed) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultPack) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultPackMethod) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultPackQuality) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultSound) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultSessionGeometry) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultSessionGeometryFullScreen) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultSessionGeometryWidth) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultSessionGeometryHeight) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultKbdLayout) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultKbdType) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultChangeKbd) + + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, sessionConfigFile) + + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultSessionName) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultSessionId) + + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultUserName) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultSessionCommand) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultSSHPort) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, defaultSSHKey) + + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, brokerUrl) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, brokerSSHKey) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, brokerName) + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, authId) + + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, autoStartApp) + + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, homeDirectory) + + X2GO_RO_PROPERTY_REF(X2GoClientConfigDetail, readExportsFrom) X2GO_PROPERTY_GETTER(QList<X2GoClientConfigDetail*>, configDetails) public: diff --git a/x2goclientconfigdetail.h b/x2goclientconfigdetail.h index 9cf7708..5bfa6ac 100644 --- a/x2goclientconfigdetail.h +++ b/x2goclientconfigdetail.h @@ -28,14 +28,13 @@ class X2GoClientConfigDetail { friend class X2GoClientConfig; typedef bool (X2GoClientConfig::*CheckSanityFunction)(QVariant value); - X2GO_PROPERTY_GETTER( QVariant, value) + X2GO_PROPERTY( QVariant, value) X2GO_PROPERTY_GETTER( QString, commandLineParameter) X2GO_PROPERTY_GETTER( QString, configFileParameter) X2GO_PROPERTY_GETTER( QString, description) private: CheckSanityFunction checkSanityFunction; X2GoClientConfig* parent; - QVariant value; QString commandLineParameter; QString configFileParameter; QString description; hooks/post-receive -- x2goclient2.git (X2Go Client 2 (rewrite of x2goclient.git)) 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 "x2goclient2.git" (X2Go Client 2 (rewrite of x2goclient.git)).

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits November 2012