[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.1-22-g174c6c4

[X2Go dev team]

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

    move expandHome into separate file: x2goutils.cpp

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

Summary of changes:
 onmainwindow.cpp      |    9 ---------
 onmainwindow.h        |    1 -
 onmainwindow_privat.h |    1 +
 sessionbutton.cpp     |    3 ++-
 sessionwidget.cpp     |    3 ++-
 x2goclient.pro        |    6 ++++--
 6 files changed, 9 insertions(+), 14 deletions(-)

The diff of changes is:
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index a309759..53817c2 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -3178,15 +3178,6 @@ void ONMainWindow::continueLDAPSession()
     sshConnection->executeCommand ( "x2gogetservers", this, SLOT ( slotGetServers ( bool, QString,int ) ));
 }
 
-QString ONMainWindow::expandHome( QString path )
-{
-    path = path.trimmed();
-    if ( path.startsWith("~/") || path.startsWith("~\\") ) {
-        path = path.replace(QString("~"), QDir::homePath());
-    }
-    return path;
-}
-
 #ifdef Q_OS_LINUX
 void ONMainWindow::startDirectRDP()
 {
diff --git a/onmainwindow.h b/onmainwindow.h
index 8bc1c6f..7e51291 100644
--- a/onmainwindow.h
+++ b/onmainwindow.h
@@ -1088,7 +1088,6 @@ private:
     void printSshDError();
     void loadPulseModuleNativeProtocol();
     void initEmbedToolBar();
-    QString expandHome( QString path );
 #ifdef Q_OS_LINUX
     void startDirectRDP();
 #endif
diff --git a/onmainwindow_privat.h b/onmainwindow_privat.h
index e98b062..fd7876e 100644
--- a/onmainwindow_privat.h
+++ b/onmainwindow_privat.h
@@ -26,6 +26,7 @@
 
 #include "version.h"
 #include "x2goclientconfig.h"
+#include "x2goutils.h"
 #include "onmainwindow.h"
 #include "userbutton.h"
 #include "exportdialog.h"
diff --git a/sessionbutton.cpp b/sessionbutton.cpp
index 23b71e3..eb96ff5 100644
--- a/sessionbutton.cpp
+++ b/sessionbutton.cpp
@@ -17,6 +17,7 @@
 
 #include "sessionbutton.h"
 #include "x2goclientconfig.h"
+#include "x2goutils.h"
 
 #include <QFont>
 #include <QPixmap>
@@ -305,7 +306,7 @@ void SessionButton::redraw()
                          ( QVariant )
                          ":icons/128x128/x2gosession.png"
                      ).toString();
-    sessIcon = ONMainWindow::expandHome(sessIcon);
+    sessIcon = expandHome(sessIcon);
     QPixmap* pix;
 
     if (!par->brokerMode || sessIcon == ":icons/128x128/x2gosession.png")
diff --git a/sessionwidget.cpp b/sessionwidget.cpp
index 2d3c269..9e54d19 100644
--- a/sessionwidget.cpp
+++ b/sessionwidget.cpp
@@ -16,6 +16,7 @@
 ***************************************************************************/
 
 #include "sessionwidget.h"
+#include "x2goutils.h"
 #include <QBoxLayout>
 #include <QLineEdit>
 #include <QPushButton>
@@ -507,7 +508,7 @@ void SessionWidget::readConfig()
     sessIcon=st.setting()->value (
                  sessionId+"/icon",
                  ( QVariant ) ":icons/128x128/x2gosession.png" ).toString().trimmed();
-    sessIcon=ONMainWindow::expandHome(sessIcon);
+    sessIcon=expandHome(sessIcon);
     icon->setIcon ( QIcon ( sessIcon ) );
 
     server->setText ( st.setting()->value (
diff --git a/x2goclient.pro b/x2goclient.pro
index 4510219..de4d59c 100755
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -66,7 +66,8 @@ HEADERS += configdialog.h \
            brokerpassdlg.h \
            contest.h \
            xsettingswidget.h \
-           appdialog.h
+           appdialog.h \
+           x2goutils.h
 
 SOURCES += sharewidget.cpp \
            settingswidget.cpp\
@@ -101,7 +102,8 @@ SOURCES += sharewidget.cpp \
            brokerpassdlg.cpp \
            contest.cpp \
            xsettingswidget.cpp \
-           appdialog.cpp
+           appdialog.cpp \
+           x2goutils.cpp
 
 LIBS += -lssh
 


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