[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.1-18-g2f53855

[X2Go dev team]

The branch, master has been updated
       via  2f53855ca00741af1f2276163201607484ddd861 (commit)
      from  8d9dc5b9c3c1f89a4430b1d9ffcc89a311891a2c (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 2f53855ca00741af1f2276163201607484ddd861
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Nov 5 10:55:04 2013 +0100

    Properly handle (=expand) the "~" character in key filenames. (Brought to attention by Eldamir on IRC. Thanks!).

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

Summary of changes:
 debian/changelog |    2 ++
 onmainwindow.cpp |    7 +++++++
 2 files changed, 9 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 603d6ba..2d6cd76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ x2goclient (4.0.1.2-0~x2go2) UNRELEASED; urgency=low
       installed (self-signed) SSL certificate chains for https (SSL)
       session broker connections. (Fixes: #311).
     - Update man page for new --tray-icon cmdline option.
+    - Properly handle (=expand) the "~" character in key filenames. (Brought to
+      attention by Eldamir on IRC. Thanks!).
   * Pull-in packaging changes from Debian.
 
   [ Ricardo Díaz Martín ]
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 7811540..164b2a6 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -2681,6 +2681,10 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session )
         currentKey=st->setting()->value (
                        sid+"/key",
                        ( QVariant ) QString::null ).toString();
+        if ( currentKey.startsWith("~") ) {
+            currentKey = currentKey.replace(QString("~"), QDir::homePath());
+        }
+
         autologin=st->setting()->value (
                       sid+"/autologin",
                       ( QVariant ) false ).toBool();
@@ -3419,6 +3423,9 @@ bool ONMainWindow::startSession ( const QString& sid )
                   sid+"/sshproxykeyfile",
                   QString()
               ).toString() );
+    if ( proxyKey.startsWith("~") ) {
+        proxyKey = proxyKey.replace(QString("~"), QDir::homePath());
+    }
 
     proxyserver=(st->setting()->value (
                      sid+"/sshproxyhost",


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