[X2Go-Commits] x2goclient.git - build-baikal (branch) updated: 4.0.1.1-9-ga0e76cf

X2Go dev team git-admin at x2go.org
Wed Jan 8 22:20:04 CET 2014


The branch, build-baikal has been updated
       via  a0e76cf105a0a44705b53c9ddf5bf0b4483f15b5 (commit)
      from  f376e1c9e9e1b145b4ed1f2cb8a32b64ffe5f4bf (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     |    5 +++++
 httpbrokerclient.cpp |    5 +++++
 sessionwidget.cpp    |   48 ++++++++++++++++++++++++------------------------
 3 files changed, 34 insertions(+), 24 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 6360efe..5e3c3c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,11 @@ x2goclient (4.0.1.2-0~x2go2) UNRELEASED; urgency=low
     + Provide Keywords: key in .desktop file.
   * Pull-in packaging changes from Debian.
 
+  [ Ricardo Díaz Martín ]
+  * New upstream versino (4.0.1.2):
+    + Strip whitespaces off of user name, host name and other
+      strings when loading / saving session profiles.(Fixes: #315).
+
   [ Oleksandr Shneyder ]
   * New upstream version (4.0.1.2):
     - Support for keys "shadowuser" "shadowdisplay" and "shadowmode" in
diff --git a/httpbrokerclient.cpp b/httpbrokerclient.cpp
index 35f87d0..603aadd 100644
--- a/httpbrokerclient.cpp
+++ b/httpbrokerclient.cpp
@@ -41,6 +41,11 @@ HttpBrokerClient::HttpBrokerClient ( ONMainWindow* wnd, ConfigFile* cfg )
     QUrl lurl ( config->brokerurl );
     if(lurl.userName().length()>0)
         config->brokerUser=lurl.userName();
+    /*
+     * load self-signed / custome (root-)CA certificate
+     * see. http://www.thomaskeller.biz/blog/2009/01/03/ssl-verification-with-qt-and-a-custom-ca-certificate/
+     */
+
     if(config->brokerurl.indexOf("ssh://")==0)
     {
         sshBroker=true;
diff --git a/sessionwidget.cpp b/sessionwidget.cpp
index 62b7ea4..0f6ec06 100644
--- a/sessionwidget.cpp
+++ b/sessionwidget.cpp
@@ -503,21 +503,21 @@ void SessionWidget::readConfig()
     sessName->setText (
         st.setting()->value (
             sessionId+"/name",
-            ( QVariant ) tr ( "New session" ) ).toString() );
+            ( QVariant ) tr ( "New session" ) ).toString().trimmed() );
     sessIcon=st.setting()->value (
                  sessionId+"/icon",
-                 ( QVariant ) ":icons/128x128/x2gosession.png" ).toString();
+                 ( QVariant ) ":icons/128x128/x2gosession.png" ).toString().trimmed();
     icon->setIcon ( QIcon ( sessIcon ) );
 
     server->setText ( st.setting()->value (
                           sessionId+"/host",
-                          ( QVariant ) QString::null ).toString() );
+                          ( QVariant ) QString::null ).toString().trimmed() );
     uname->setText ( st.setting()->value (
                          sessionId+"/user",
-                         ( QVariant ) QString::null ).toString() );
+                         ( QVariant ) QString::null ).toString().trimmed() );
     key->setText ( st.setting()->value (
                        sessionId+"/key",
-                       ( QVariant ) QString::null ).toString() );
+                       ( QVariant ) QString::null ).toString().trimmed() );
     cbAutoLogin->setChecked(st.setting()->value (
                                 sessionId+"/autologin",
                                 ( QVariant ) false ).toBool());
@@ -545,7 +545,7 @@ void SessionWidget::readConfig()
     QString prtype= st.setting()->value (
                         sessionId+"/sshproxytype",
                         "SSH"
-                    ).toString() ;
+                    ).toString().trimmed() ;
 
     if(prtype=="HTTP")
     {
@@ -559,17 +559,17 @@ void SessionWidget::readConfig()
     proxyLogin->setText(st.setting()->value (
                             sessionId+"/sshproxyuser",
                             QString()
-                        ).toString() );
+                        ).toString().trimmed() );
 
     proxyKey->setText(st.setting()->value (
                           sessionId+"/sshproxykeyfile",
                           QString()
-                      ).toString() );
+                      ).toString().trimmed() );
 
     proxyHost->setText(st.setting()->value (
                            sessionId+"/sshproxyhost",
                            QString()
-                       ).toString() );
+                       ).toString().trimmed() );
 
     proxyPort->setValue(st.setting()->value (
                             sessionId+"/sshproxyport",
@@ -612,14 +612,14 @@ void SessionWidget::readConfig()
     QString
     command=st.setting()->value (
                 sessionId+"/command",
-                ( QVariant ) mainWindow->getDefaultCmd() ).toString();
+                ( QVariant ) mainWindow->getDefaultCmd() ).toString().trimmed();
 
     rdpOptions=st.setting()->value ( sessionId+"/rdpoptions",
-                                     ( QVariant ) "" ).toString();
+                                     ( QVariant ) "" ).toString().trimmed();
     rdpServer=st.setting()->value ( sessionId+"/rdpserver",
-                                    ( QVariant ) "" ).toString();
+                                    ( QVariant ) "" ).toString().trimmed();
     xdmcpServer=st.setting()->value ( sessionId+"/xdmcpserver",
-                                      ( QVariant ) "localhost" ).toString();
+                                      ( QVariant ) "localhost" ).toString().trimmed();
 #ifdef Q_OS_LINUX
     cbDirectRDP->setChecked(st.setting()->value (
                                 sessionId+"/directrdp",false ).toBool());
@@ -763,16 +763,16 @@ void SessionWidget::saveSettings()
 
     X2goSettings st ( "sessions" );
     st.setting()->setValue ( sessionId+"/name",
-                             ( QVariant ) sessName->text() );
+                             ( QVariant ) sessName->text().trimmed() );
     st.setting()->setValue ( sessionId+"/icon",
                              ( QVariant ) sessIcon );
     st.setting()->setValue ( sessionId+"/host",
-                             ( QVariant ) server->text() );
+                             ( QVariant ) server->text().trimmed() );
     st.setting()->setValue ( sessionId+"/user",
-                             ( QVariant ) uname->text() );
+                             ( QVariant ) uname->text().trimmed() );
 
     st.setting()->setValue ( sessionId+"/key",
-                             ( QVariant ) key->text() );
+                             ( QVariant ) key->text().trimmed() );
 #ifdef Q_OS_LINUX
     st.setting()->setValue ( sessionId+"/rdpport",
                              ( QVariant ) rdpPort->value() );
@@ -792,16 +792,16 @@ void SessionWidget::saveSettings()
     if ( sessBox->currentIndex() < OTHER )
         command=sessBox->currentText();
     else
-        command=cmd->text();
+        command=cmd->text().trimmed();
     if ( sessBox->currentIndex() == RDP )
     {
         command="RDP";
-        rdpServer=cmd->text();
+        rdpServer=cmd->text().trimmed();
     }
     if ( sessBox->currentIndex() == XDMCP )
     {
         command="XDMCP";
-        xdmcpServer=cmd->text();
+        xdmcpServer=cmd->text().trimmed();
     }
     if ( sessBox->currentIndex() == SHADOW )
     {
@@ -826,7 +826,7 @@ void SessionWidget::saveSettings()
     if ( sessBox->currentIndex() ==APPLICATION )
     {
         rootless=true;
-        command=mainWindow->internAppName ( cmdCombo->lineEdit()->text() );
+        command=mainWindow->internAppName ( cmdCombo->lineEdit()->text().trimmed() );
     }
     if ( sessBox->currentIndex() == PUBLISHED)
         published=true;
@@ -857,9 +857,9 @@ void SessionWidget::saveSettings()
     {
         st.setting()->setValue ( sessionId+"/sshproxytype","SSH");
     }
-    st.setting()->setValue (sessionId+"/sshproxyuser",proxyLogin->text());
-    st.setting()->setValue (sessionId+"/sshproxykeyfile",proxyKey->text());
-    st.setting()->setValue (sessionId+"/sshproxyhost",proxyHost->text());
+    st.setting()->setValue (sessionId+"/sshproxyuser",proxyLogin->text().trimmed());
+    st.setting()->setValue (sessionId+"/sshproxykeyfile",proxyKey->text().trimmed());
+    st.setting()->setValue (sessionId+"/sshproxyhost",proxyHost->text().trimmed());
     st.setting()->setValue (sessionId+"/sshproxyport",proxyPort->value());
     st.setting()->setValue (sessionId+"/sshproxysamepass",cbProxySamePass->isChecked());
     st.setting()->setValue (sessionId+"/sshproxysameuser",cbProxySameUser->isChecked());


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




More information about the x2go-commits mailing list