[X2Go-Commits] [x2goclient] 01/01: onmainwindow.cpp: fix session icon not being displayed as tray icon (missed legacy resource URI wrapper call.)

git-admin at x2go.org git-admin at x2go.org
Thu Mar 12 01:32:08 CET 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 7b18f20da79fa78056a26a34daebdcca842d4167
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Mar 12 01:26:26 2015 +0100

    onmainwindow.cpp: fix session icon not being displayed as tray icon (missed legacy resource URI wrapper call.)
---
 debian/changelog     |    2 ++
 src/onmainwindow.cpp |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7b28f15..9e558ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -203,6 +203,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
     - onmainwindow.cpp: typo fix (authoized_keys.)
     - onmainwindow.cpp: stop exporting directories (Printing, File Sharing) on
       sshd error.
+    - onmainwindow.cpp: fix session icon not being displayed as tray icon
+      (missed legacy resource URI wrapper call.)
 
  -- X2Go Release Manager <git-admin at x2go.org>  Thu, 19 Feb 2015 13:25:28 +0100
 
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index f7fa74e..d14c899 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -4212,7 +4212,7 @@ void ONMainWindow::setTrayIconToSessionIcon(QString info) {
             sid="embedded";
 
         if (!keepTrayIcon) {
-            QString imagePath = expandHome(st->setting()->value(sid + "/icon", (QVariant) QString(":/img/icons/128x128/x2go.png")).toString());
+            QString imagePath = wrap_legacy_resource_URIs (expandHome(st->setting()->value(sid + "/icon", (QVariant) QString(":/img/icons/128x128/x2go.png")).toString()));
             trayIcon->setIcon(QIcon (imagePath));
         }
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list