[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.1-28-g2cbf163

[X2Go dev team]

The branch, master has been updated
       via  2cbf163320a11a5f832bfe6b8f201a1616d89496 (commit)
      from  21bd075b993702a0ced5271889202b2eb0d32291 (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 2cbf163320a11a5f832bfe6b8f201a1616d89496
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Nov 27 11:12:45 2013 +0100

    use expandHome(...) for more cmd line options

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

Summary of changes:
 onmainwindow.cpp |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 53817c2..4677134 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -6626,12 +6626,12 @@ bool ONMainWindow::parseParameter ( QString param )
     }
     if ( setting == "--broker-cacertfile")
     {
-        config.brokerCaCertFile=value;
+        config.brokerCaCertFile=expandHome(value);
         return true;
     }
     if ( setting == "--broker-ssh-key")
     {
-        config.brokerSshKey=value;
+        config.brokerSshKey=expandHome(value);
         return true;
     }
     if ( setting == "--ssh-key")
@@ -6642,15 +6642,15 @@ bool ONMainWindow::parseParameter ( QString param )
         switch(parts.length())
         {
         case 1:
-            key.key=parts[0];
+            key.key=expandHome(parts[0]);
             break;
         case 2:
-            key.key=parts[1];
+            key.key=expandHome(parts[1]);
             authPart=parts[0];
             break;
         case 3:
             authPart=parts[0];
-            key.key=parts[2];
+            key.key=expandHome(parts[2]);
             key.port=parts[1];
             break;
         }
@@ -6691,6 +6691,7 @@ bool ONMainWindow::parseParameter ( QString param )
     }
     if (setting == "--support-menu")
     {
+        value = expandHome(value)
         if (! QFile::exists(value))
         {
             printError( param + tr(" (file not exists)"));
@@ -6701,6 +6702,7 @@ bool ONMainWindow::parseParameter ( QString param )
     }
     if (setting == "--background")
     {
+        value = expandHome(value)
         if (! QFile::exists(value))
         {
             printError( param + tr(" (file not exists)"));


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