This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/general in repository x2goclient. commit 3d578752ed4de8f03673d22181952e798f4484ba Author: Jason Alavaliant <alavaliant@ra09.com> Date: Fri Mar 20 05:37:38 2015 +0100 onmainwindow.cpp: handle %i and %c format flags in desktop files correctly: remove the %i flag and replace %c with the application name. Fixes: #827. --- debian/changelog | 6 ++++++ src/onmainwindow.cpp | 2 ++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index db1aefd..f14053e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -254,6 +254,12 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low * New upstream release (4.0.4.0): - onmainwindow.cpp: fix desktop sharing via session broker. Fixes: #584. + [ Jason Alavaliant ] + * New upstream release (4.0.4.0): + - onmainwindow.cpp: handle %i and %c format flags in desktop files + correctly: remove the %i flag and replace %c with the application name. + Fixes: #827. + -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 13:25:28 +0100 x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 2a22be4..e8c0026 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -6442,6 +6442,8 @@ void ONMainWindow::slotReadApplications(bool result, QString output, app.exec.replace(" %u","",Qt::CaseInsensitive); app.exec.replace("%f","",Qt::CaseInsensitive); app.exec.replace("%u","",Qt::CaseInsensitive); + app.exec.replace("%i","",Qt::CaseInsensitive); + app.exec.replace("%c",app.name,Qt::CaseInsensitive); if (app.exec==autostartApp) startAppFound=true; // x2goDebug<<"exec: "<<app.exec<<endl; -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git