[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.1-20-g2fe3c60

[X2Go dev team]

The branch, master has been updated
       via  2fe3c60ec53e9029a4c3f3a3c4e1dda069c12eac (commit)
      from  74913d557824edb1dedc0784223484070399e072 (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 2fe3c60ec53e9029a4c3f3a3c4e1dda069c12eac
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Nov 14 11:21:06 2013 +0100

    improve/fix last commit

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

Summary of changes:
 onmainwindow.cpp  |    6 ++++--
 sessionbutton.cpp |    1 +
 sessionwidget.cpp |    1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 9d1c353..a309759 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -2655,7 +2655,7 @@ void ONMainWindow::slotSelectedFromList ( SessionButton* session )
                      sid+"/icon",
                      ( QVariant ) ":icons/128x128/x2gosession.png"
                  ).toString();
-
+        sessIcon=expandHome(sessIcon);
 
         command=st->setting()->value (
                     sid+"/command",
@@ -3180,6 +3180,7 @@ void ONMainWindow::continueLDAPSession()
 
 QString ONMainWindow::expandHome( QString path )
 {
+    path = path.trimmed();
     if ( path.startsWith("~/") || path.startsWith("~\\") ) {
         path = path.replace(QString("~"), QDir::homePath());
     }
@@ -4271,7 +4272,7 @@ void ONMainWindow::setTrayIconToSessionIcon(QString info) {
         else
             sid="embedded";
 
-        QString imagePath = st->setting()->value(sid + "/icon", (QVariant) QString(":icons/128x128/x2go.png")).toString();
+        QString imagePath = expandHome(st->setting()->value(sid + "/icon", (QVariant) QString(":icons/128x128/x2go.png")).toString());
         trayIcon->setIcon(QIcon (imagePath));
 
         QString name=st->setting()->value ( sid +"/name").toString() ;
@@ -6719,6 +6720,7 @@ bool ONMainWindow::parseParameter ( QString param )
     }
     if (setting == "--session-icon")
     {
+        value=expandHome(value);
         if (! QFile::exists(value))
         {
             printError( param + tr(" (file not exists)"));
diff --git a/sessionbutton.cpp b/sessionbutton.cpp
index 5204093..23b71e3 100644
--- a/sessionbutton.cpp
+++ b/sessionbutton.cpp
@@ -305,6 +305,7 @@ void SessionButton::redraw()
                          ( QVariant )
                          ":icons/128x128/x2gosession.png"
                      ).toString();
+    sessIcon = ONMainWindow::expandHome(sessIcon);
     QPixmap* pix;
 
     if (!par->brokerMode || sessIcon == ":icons/128x128/x2gosession.png")
diff --git a/sessionwidget.cpp b/sessionwidget.cpp
index 0f6ec06..2d3c269 100644
--- a/sessionwidget.cpp
+++ b/sessionwidget.cpp
@@ -507,6 +507,7 @@ void SessionWidget::readConfig()
     sessIcon=st.setting()->value (
                  sessionId+"/icon",
                  ( QVariant ) ":icons/128x128/x2gosession.png" ).toString().trimmed();
+    sessIcon=ONMainWindow::expandHome(sessIcon);
     icon->setIcon ( QIcon ( sessIcon ) );
 
     server->setText ( st.setting()->value (


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