[X2Go-Commits] [x2goclient] 02/02: src/sessionbutton.cpp: we cannot use ".." in resource paths to move up one level, so use images_resource_path () instead and hope that we finally get a yummy hamburger.

[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 707f99075d7a3011016aac13322419b7acb1fa6d
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Jan 17 17:37:25 2017 +0100

    src/sessionbutton.cpp: we cannot use ".." in resource paths to move up one level, so use images_resource_path () instead and hope that we finally get a yummy hamburger.
---
 debian/changelog      |    3 +++
 src/sessionbutton.cpp |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6e0f478..b84b2f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,9 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
       issues in mini mode.
     - src/onmainwindow.{cpp,h}: add new function images_resource_path (),
       similar to iconsPath () but without explicitly referring to icons.
+    - src/sessionbutton.cpp: we cannot use ".." in resource paths to move up
+      one level, so use images_resource_path () instead and hope that we
+      finally get a yummy hamburger.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.0.5.3):
diff --git a/src/sessionbutton.cpp b/src/sessionbutton.cpp
index a8cb919..49f0ae3 100644
--- a/src/sessionbutton.cpp
+++ b/src/sessionbutton.cpp
@@ -121,7 +121,7 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id )
     editBut=new QPushButton ( this );
     editBut->setMouseTracking ( true );
     connect ( editBut,SIGNAL ( pressed() ),this,SLOT ( slotShowMenu() ) );
-    editBut->setIcon ( QIcon ( par->iconsPath ( "/../svg/hamburger.svg" ) ) );
+    editBut->setIcon ( QIcon ( par->images_resource_path ( "/svg/hamburger.svg" ) ) );
     editBut->setIconSize ( QSize ( 32,32 ) );
     editBut->setFixedSize ( 48,48 );
     editBut->setFlat ( true );

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