This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 5bbfdde880eae5fa30ad06053ef5118fcf25a441 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 00:00:01 2015 +0100 sessionexplorer, sessionwidget: wrap more places in wrap_legacy_resource_URIs(). --- src/sessionexplorer.cpp | 8 +++----- src/sessionwidget.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/sessionexplorer.cpp b/src/sessionexplorer.cpp index fcdd719..5e54c0d 100644 --- a/src/sessionexplorer.cpp +++ b/src/sessionexplorer.cpp @@ -167,11 +167,9 @@ void SessionExplorer::slotCreateDesktopIcon ( SessionButton* bt ) name.replace("/","::"); - QString sessIcon=st.setting()->value ( - bt->id() +"/icon", - ( QVariant ) - ":/img/icons/128x128/x2gosession.png" - ).toString(); + QString sessIcon = wrap_legacy_resource_URIs (st.setting ()->value (bt->id() + "/icon", + (QVariant) ":/img/icons/128x128/x2gosession.png" + ).toString ()); sessIcon = expandHome(sessIcon); if ( sessIcon.startsWith ( ":/img/icons",Qt::CaseInsensitive ) || !sessIcon.endsWith ( ".png",Qt::CaseInsensitive ) ) diff --git a/src/sessionwidget.cpp b/src/sessionwidget.cpp index e49b718..13abd99 100644 --- a/src/sessionwidget.cpp +++ b/src/sessionwidget.cpp @@ -409,7 +409,7 @@ void SessionWidget::slot_getIcon() tr ( "Pictures" ) +" (*.png *.xpm *.jpg)" ); if ( path!=QString::null ) { - sessIcon=path; + sessIcon = wrap_legacy_resource_URIs (path); icon->setIcon ( QIcon ( sessIcon ) ); } } @@ -545,10 +545,10 @@ void SessionWidget::readConfig() sessName->setText (name); - sessIcon=st.setting()->value ( - sessionId+"/icon", - ( QVariant ) ":/img/icons/128x128/x2gosession.png" ).toString().trimmed(); - sessIcon=expandHome(sessIcon); + sessIcon = wrap_legacy_resource_URIs (st.setting ()->value (sessionId+"/icon", + (QVariant) ":/img/icons/128x128/x2gosession.png" + ).toString ().trimmed ()); + sessIcon = expandHome (sessIcon); icon->setIcon ( QIcon ( sessIcon ) ); server->setText ( st.setting()->value ( -- Alioth's /srv/git/code.x2go.org/x2goclient.git//../..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git