This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 11110ba send to broker xdmcpserver in command option when starting xdmcp session. new 4962b42 improve processing stderr from nxproxy. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + src/onmainwindow.cpp | 18 ++++++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 4962b427a121025f381093044e777fcdbd21a67a Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Mon Jul 25 11:28:17 2022 -0500 improve processing stderr from nxproxy. --- debian/changelog | 1 + src/onmainwindow.cpp | 18 ++++++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 444d302..83a50ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,6 +44,7 @@ x2goclient (4.1.2.3-0x2go1) UNRELEASED; urgency=medium when exporting session default directories. - create default export directory if not exists. - send to broker xdmcpserver in command option when starting xdmcp session. + - improve processing stderr from nxproxy. [ Ryan Schmidt ] * New upstream version (4.1.2.3): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index c5ea26c..7b1df5b 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -4260,10 +4260,6 @@ void ONMainWindow::sendEventToBroker(ONMainWindow::client_events ev) { return; } - if(ev <= lastBrokerEvent && resumingSession.sessionId == lastBrokerEventSession && ev != ALIVE) - { - return; - } if(ev!=ALIVE) lastBrokerEvent=ev; lastBrokerEventSession=resumingSession.sessionId; @@ -4281,7 +4277,9 @@ void ONMainWindow::sendEventToBroker(ONMainWindow::client_events ev) event="CONNECTED"; resumingSession.connectedSince=QDateTime::currentDateTime().toTime_t(); if(config.brokerLiveEventsTimeout) + { brokerAliveTimer->start(config.brokerLiveEventsTimeout*1000); + } break; } case SUSPENDING: @@ -6893,14 +6891,14 @@ void ONMainWindow::slotProxyStderr() stInfo->insertPlainText ( reserr ); stInfo->ensureCursorVisible(); - if ( stInfo->toPlainText().indexOf ( + if ( reserr.indexOf ( "Connecting to remote host 'localhost:"+ /*resumingSession.grPort*/ localGraphicPort ) !=-1 ) { setStatStatus ( tr ( "connecting" ) ); } - if ( stInfo->toPlainText().indexOf ( + if ( reserr.indexOf ( "Connection to remote proxy 'localhost:"+ /*resumingSession.grPort*/ localGraphicPort+"' established" ) !=-1 ) @@ -6915,7 +6913,7 @@ void ONMainWindow::slotProxyStderr() } } - if ( stInfo->toPlainText().indexOf ( + if ( reserr.indexOf ( "Established X server connection" ) !=-1 ) { if(brokerMode) @@ -6985,7 +6983,7 @@ void ONMainWindow::slotProxyStderr() } #endif } - if ( stInfo->toPlainText().indexOf ( + if ( reserr.indexOf ( tr ( "Connection timeout, aborting" ) ) !=-1 ) setStatStatus ( tr ( "aborting" ) ); } @@ -7321,7 +7319,7 @@ void ONMainWindow::slotRestartProxy() { if ( !sessionStatusDlg->isVisible() ) return; - if ( stInfo->toPlainText().indexOf ( + if ( proxyErrString.indexOf ( "Established X server connection" ) ==-1 ) { stInfo->insertPlainText ( @@ -7340,7 +7338,7 @@ void ONMainWindow::slotTestSessionStatus() if ( !sessionStatusDlg->isVisible() ) return; - if ( stInfo->toPlainText().indexOf ( + if ( proxyErrString.indexOf ( "Established X server connection" ) ==-1 ) { stInfo->insertPlainText ( -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org