x2goclient.git - master (branch) updated: 3.99.2.2-49-gf33832a - x2go-commits

21 Sep 2012

The branch, master has been updated
       via  f33832a96043e4445ac4cbf1492da65f44011787 (commit)
      from  a681201e8d7a961522c9cf76f7bf13f79ba539f5 (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 f33832a96043e4445ac4cbf1492da65f44011787
Author: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de>
Date:   Fri Sep 21 15:41:02 2012 +0200

    Add command line parameter --ssh-key and --autologin

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

Summary of changes:
 debian/changelog |    1 +
 onmainwindow.cpp |   36 ++++++++++++++++++++++++++++--------
 onmainwindow.h   |    6 ++++--
 3 files changed, 33 insertions(+), 10 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index d9db3d4..00d0dea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,6 +53,7 @@ x2goclient (3.99.3.0-0~x2go1) UNRELEASED; urgency=low
     - 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 
+    - Add command line parameter --ssh-key and --autologin 
 
   [ Ricardo Diaz ]
   * New upstream version (3.99.3.0):
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 709809b..6af31d4 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -67,6 +67,7 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
     defaultSetDPI=false;
     defaultDPI=96;
     extStarted=false;
+    cmdAutologin=false;
     defaultLink=2;
     defaultFullscreen=false;
     defaultXinerama=false;
@@ -2760,6 +2761,14 @@ SshMasterConnection* ONMainWindow::startSshConnection ( QString host, QString po
     /////key/sshagent/env/
 
     passForm->setEnabled ( false );
+    if(cmdSshKey.length()>0)
+    {
+        currentKey=cmdSshKey;
+    }
+    if(cmdAutologin)
+    {
+        autologin=true;
+    }
     con=new SshMasterConnection ( host, port.toInt(),acceptUnknownHosts,
                                   login, password,currentKey, autologin,krbLogin, this );
     if (!getSrv)
@@ -4144,7 +4153,7 @@ void ONMainWindow::slotSuspendSess()
     if (directRDP)
     {
         nxproxy->terminate();
-	proxyRunning=false;
+        proxyRunning=false;
         return;
     }
 #endif
@@ -4201,7 +4210,7 @@ void ONMainWindow::slotSuspendSessFromSt()
     if (directRDP)
     {
         nxproxy->terminate();
-	proxyRunning=false;
+        proxyRunning=false;
         return;
     }
 #endif
@@ -4225,7 +4234,7 @@ void ONMainWindow::slotTermSessFromSt()
     if (directRDP)
     {
         nxproxy->terminate();
-	proxyRunning=false;
+        proxyRunning=false;
         return;
     }
 #endif
@@ -4294,7 +4303,7 @@ void ONMainWindow::slotTermSess()
     if (directRDP)
     {
         nxproxy->terminate();
-	proxyRunning=false;
+        proxyRunning=false;
         return;
     }
 #endif
@@ -4993,7 +5002,7 @@ void ONMainWindow::slotTunnelFailed ( bool result,  QString output,
         tunnel=sndTunnel=fsTunnel=0l;
         soundServer=0l;
         nxproxy=0l;
-	proxyRunning=false;
+        proxyRunning=false;
         if ( !managedMode )
             slotShowPassForm();
     }
@@ -5538,7 +5547,7 @@ void ONMainWindow::slotRestartProxy()
                 "Connection timeout, aborting" ) );
         if ( nxproxy )
             nxproxy->terminate();
-	proxyRunning=false;
+        proxyRunning=false;
         restartResume=true;
     }
 }
@@ -5556,7 +5565,7 @@ void ONMainWindow::slotTestSessionStatus()
             tr ( "Connection timeout, aborting" ) );
         if ( nxproxy )
             nxproxy->terminate();
-	proxyRunning=false;
+        proxyRunning=false;
     }
 }
 
@@ -6029,6 +6038,12 @@ bool ONMainWindow::parseParameter ( QString param )
         changeBrokerPass=true;
         return true;
     }
+    if ( param == "--autologin")
+    {
+        cmdAutologin=true;
+        return true;
+    }
+
 
 
     QString setting,value;
@@ -6153,6 +6168,11 @@ bool ONMainWindow::parseParameter ( QString param )
         config.brokerurl=value;
         return true;
     }
+    if ( setting == "--ssh-key")
+    {
+        cmdSshKey=value;
+        return true;
+    }
     if ( setting == "--broker-name")
     {
         config.brokerName=value;
@@ -7497,7 +7517,7 @@ void ONMainWindow::externalLogout ( const QString& )
         if ( nxproxy )
             if ( nxproxy->state() ==QProcess::Running )
                 nxproxy->terminate();
-	    proxyRunning=false;
+        proxyRunning=false;
     }
 }
 
diff --git a/onmainwindow.h b/onmainwindow.h
index d7c0e4b..528df0b 100644
--- a/onmainwindow.h
+++ b/onmainwindow.h
@@ -237,10 +237,10 @@ private:
 class ClickLineEdit;
 class ONMainWindow : public QMainWindow
 #ifdef CFGPLUGIN
-            , public QtNPBindable
+    , public QtNPBindable
 
 #ifdef QAXSERVER
-            , public QAxBindable
+    , public QAxBindable
 #endif
 #endif
 {
@@ -508,6 +508,8 @@ private:
     bool thinMode;
     QString statusString;
     QString autostartApp;
+    bool cmdAutologin;
+    QString cmdSshKey;
     int defaultLink;
     int defaultQuality;
     int defaultWidth;


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

    