x2goclient.git - master (branch) updated: 3.99.2.2-35-gbace365 - x2go-commits

12 Sep 2012

The branch, master has been updated
       via  bace365a71c05d924288e2f0b8d0ff1af2245a19 (commit)
      from  2064f1f03a69ddff01503c308fc6ea31e5785cd0 (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 bace365a71c05d924288e2f0b8d0ff1af2245a19
Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>
Date:   Wed Sep 12 10:54:13 2012 +0200

    Fixing kbd focus issue for all kinds of sessions in thinclient mode

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    1 +
 onmainwindow.cpp |   16 ++++++++++++++--
 onmainwindow.h   |    1 +
 3 files changed, 16 insertions(+), 2 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index a5de44f..f5dc500 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,7 @@ x2goclient (3.99.3.0-0~x2go1) UNRELEASED; urgency=low
       and German translation.
     - Restart pulse server on windows if it crashed.
     - Show "Advanced Options" button only if RDP session chosen
+    - Fixing kbd focus issue for all kinds of sessions in thinclient mode 
 
  -- Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>  Wed, 05 Sep 2012 11:40:47 +0200
 
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 396503d..f4fdfa3 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -73,6 +73,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
     acceptRsa=false;
     cardStarted=false;
     cardReady=false;
+    proxyRunning=false;
 // 	useSshAgent=false;
     closeEventSent=false;
     miniMode=false;
@@ -485,7 +486,7 @@ void ONMainWindow::slotShutdownThinClient()
 
 void ONMainWindow::slotSyncX()
 {
-    if (proxyWinId)
+    if (proxyRunning)
     {
         if (!isHidden())
             hide();
@@ -3093,7 +3094,7 @@ void ONMainWindow::startDirectRDP()
 
     showSessionStatus();
 //     QTimer::singleShot ( 30000,this,SLOT ( slotRestartProxy() ) );
-
+    proxyRunning=true;
 }
 
 #endif
@@ -4138,6 +4139,7 @@ void ONMainWindow::slotSuspendSess()
     if (directRDP)
     {
         nxproxy->terminate();
+	proxyRunning=false;
         return;
     }
 #endif
@@ -4194,6 +4196,7 @@ void ONMainWindow::slotSuspendSessFromSt()
     if (directRDP)
     {
         nxproxy->terminate();
+	proxyRunning=false;
         return;
     }
 #endif
@@ -4217,6 +4220,7 @@ void ONMainWindow::slotTermSessFromSt()
     if (directRDP)
     {
         nxproxy->terminate();
+	proxyRunning=false;
         return;
     }
 #endif
@@ -4285,6 +4289,7 @@ void ONMainWindow::slotTermSess()
     if (directRDP)
     {
         nxproxy->terminate();
+	proxyRunning=false;
         return;
     }
 #endif
@@ -4931,6 +4936,7 @@ void ONMainWindow::slotTunnelOk()
 #endif //Q_OS_DARWIN
     x2goDebug<<"starting nxproxy with: "<<proxyCmd<<endl;
     nxproxy->start ( proxyCmd );
+    proxyRunning=true;
 //always search for proxyWin
     proxyWinTimer->start ( 300 );
     if ( embedMode )
@@ -4982,6 +4988,7 @@ void ONMainWindow::slotTunnelFailed ( bool result,  QString output,
         tunnel=sndTunnel=fsTunnel=0l;
         soundServer=0l;
         nxproxy=0l;
+	proxyRunning=false;
         if ( !managedMode )
             slotShowPassForm();
     }
@@ -5067,6 +5074,7 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus )
                  SLOT ( slotProxyStderr() ) );
     disconnect ( nxproxy,SIGNAL ( readyReadStandardOutput() ),this,
                  SLOT ( slotProxyStdout() ) );
+    proxyRunning=false;
 #ifndef CFGPLUGIN
     if (trayEnabled)
     {
@@ -5434,6 +5442,7 @@ bool ONMainWindow::termSession ( QString sessId, bool warn )
                                             QString,SshProcess* ) ) );
 
     proc->startNormal ( "x2goterminate-session "+sessId );
+    proxyRunning=false;
     return true;
 }
 
@@ -5524,6 +5533,7 @@ void ONMainWindow::slotRestartProxy()
                 "Connection timeout, aborting" ) );
         if ( nxproxy )
             nxproxy->terminate();
+	proxyRunning=false;
         restartResume=true;
     }
 }
@@ -5541,6 +5551,7 @@ void ONMainWindow::slotTestSessionStatus()
             tr ( "Connection timeout, aborting" ) );
         if ( nxproxy )
             nxproxy->terminate();
+	proxyRunning=false;
     }
 }
 
@@ -7475,6 +7486,7 @@ void ONMainWindow::externalLogout ( const QString& )
         if ( nxproxy )
             if ( nxproxy->state() ==QProcess::Running )
                 nxproxy->terminate();
+	    proxyRunning=false;
     }
 }
 
diff --git a/onmainwindow.h b/onmainwindow.h
index 9fd3527..d7c0e4b 100644
--- a/onmainwindow.h
+++ b/onmainwindow.h
@@ -488,6 +488,7 @@ private:
     QStringList _internApplicationsNames;
     QStringList _transApplicationsNames;
     QString portableDataPath;
+    bool proxyRunning;
     bool drawMenu;
     bool extStarted;
     bool startMaximized;


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).

    