[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.1-23-ga965d2b

[X2Go dev team]

The branch, master has been updated
       via  a965d2bf9d5de13c0e29036078f5b4646a67cd1e (commit)
      from  174c6c4c29ab92e49403670a5f426f78c9803216 (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 a965d2bf9d5de13c0e29036078f5b4646a67cd1e
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Nov 14 11:46:11 2013 +0100

    forgot new files...

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

Summary of changes:
 x2goclient.cpp => x2goutils.cpp |   11 ++++++++---
 version.h => x2goutils.h        |    8 +++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)
 copy x2goclient.cpp => x2goutils.cpp (83%)
 copy version.h => x2goutils.h (92%)

The diff of changes is:
diff --git a/x2goclient.cpp b/x2goutils.cpp
similarity index 83%
copy from x2goclient.cpp
copy to x2goutils.cpp
index 4fdd905..8a82dd4 100644
--- a/x2goclient.cpp
+++ b/x2goutils.cpp
@@ -15,9 +15,14 @@
 *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
 ***************************************************************************/
 
-#include "ongetpass.h"
+#include <QString>
+#include <QDir>
 
-int main(int argc, char *argv[])
+QString expandHome( QString path )
 {
-	return x2goMain(argc,argv);
+    path = path.trimmed();
+    if ( path.startsWith("~/") || path.startsWith("~\\") ) {
+        path = path.replace(QString("~"), QDir::homePath());
+    }
+    return path;
 }
diff --git a/version.h b/x2goutils.h
similarity index 92%
copy from version.h
copy to x2goutils.h
index 14773c6..5625625 100644
--- a/version.h
+++ b/x2goutils.h
@@ -15,5 +15,11 @@
 *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
 ***************************************************************************/
 
-#define VERSION "4.0.1.2"
+#ifndef X2GOUTILS_H
+#define X2GOUTILS_H
 
+#include <QString>
+
+QString expandHome( QString path );
+
+#endif


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