The branch, master has been updated via a681201e8d7a961522c9cf76f7bf13f79ba539f5 (commit) from 28739bee81dc6c3ad9050d0b468436589de3f0ad (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a681201e8d7a961522c9cf76f7bf13f79ba539f5 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Sep 17 20:45:12 2012 +0200 Fix creation of session profile icon on desktop. The .desktop files need the x-bit set. Also: add a compatibility profile name rewrite for PyHoca-GUI profile names containing a slash, PyHoca-GUI uses a slash as separator character for submenu cascades. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 4 ++++ onmainwindow.cpp | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 0ab6b6d..d9db3d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,10 @@ x2goclient (3.99.3.0-0~x2go1) UNRELEASED; urgency=low login dialog. Only replace username+password if they received a value from the login widget of the main window. - Drop i18n idea to translate English to English. + - Fix creation of session profile icon on desktop. The .desktop + files need the x-bit set. Also: add a compatibility profile name + rewrite for PyHoca-GUI profile names containing a slash, PyHoca-GUI + uses a slash as separator character for submenu cascades. * /debian/control: + Maintainer change in package: X2Go Developers <x2go-dev@lists.berlios.de>. + Add rdesktop and xfreerdp to Recommends. diff --git a/onmainwindow.cpp b/onmainwindow.cpp index c67a0ea..709809b 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -2023,6 +2023,10 @@ void ONMainWindow::slotCreateDesktopIcon ( SessionButton* bt ) QString name=st.setting()->value ( bt->id() +"/name", ( QVariant ) tr ( "New Session" ) ).toString() ; + + // PyHoca-GUI uses the slash as separator for cascaded menus, so let's handle these on the file system + name.replace("/","::"); + QString sessIcon=st.setting()->value ( bt->id() +"/icon", ( QVariant ) @@ -2045,13 +2049,14 @@ void ONMainWindow::slotCreateDesktopIcon ( SessionButton* bt ) cmd="x2goclient --hide"; QTextStream out ( &file ); out << "[Desktop Entry]\n"<< - "Exec[$e]="<<cmd<<" --sessionid="<<bt->id() <<"\n"<< + "Exec="<<cmd<<" --sessionid="<<bt->id() <<"\n"<< "Icon="<<sessIcon<<"\n"<< "Name="<<name<<"\n"<< "StartupNotify=true\n"<< "Terminal=false\n"<< "Type=Application\n"<< "X-KDE-SubstituteUID=false\n"; + file.setPermissions(QFile::ReadOwner|QFile::WriteOwner|QFile::ExeOwner); file.close(); #else QString scrname=QDir::tempPath() +"\\mklnk.vbs"; hooks/post-receive -- x2goclient.git (X2Go Client) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2goclient.git" (X2Go Client).