[X2Go-Commits] [x2goclient] 03/04: src/onmainwindow.cpp: use images_resource_path () in iconsPath ().

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goclient.

commit 7f48257cdcbd388c9fb5bc1cbf391f7e8835ca51
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Jan 18 07:48:42 2017 +0100

    src/onmainwindow.cpp: use images_resource_path () in iconsPath ().
---
 debian/changelog     |    1 +
 src/onmainwindow.cpp |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 13b269b..998ae31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - src/onmainwindow.{cpp,h}: let images_resource_path () take a new,
       optional "base" parameter, that might be empty and is put in-between the
       fixed resource path string and the filename parameter.
+    - src/onmainwindow.cpp: use images_resource_path () in iconsPath ().
 
   [ Bernard Cafarelli ]
   * New upstream version (4.0.5.3):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index e11269d..f234e2f 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -1667,7 +1667,7 @@ QString ONMainWindow::iconsPath ( const QString &fname ) const
     /*    QFile fl(this->kdeIconsPath+fname);
     	if(fl.exists())
     	return kdeIconsPath+fname;*/
-    return ( QString ) ":/img/icons"+fname;
+    return (images_resource_path (fname, "/icons/"));
 }
 
 QString ONMainWindow::images_resource_path (const QString &filename, const QString &base) const {

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