This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit b60aa1d4e5ee1c8f294f9a3c93a661953e1045c4 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Aug 29 13:14:34 2014 +0200 Provide Web browser shortcut in the MATE panel. --- debian/changelog | 1 + debian/x2gothinclient-minidesktop.install | 2 +- .../desktop/x2gothinclient-x-www-browser.desktop | 13 +++++++++++++ .../x2gothinclient-minidesktop.layout | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5beeea5..613a251 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,6 +48,7 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low . Disallow Caja to handle storage media (automounting, opening, etc.). . Enable usbmounts and smartcard rules for minidestop TCE flavour. . Enforce TCE session restart after logout. + . Provide Web browser shortcut in the MATE panel. - Adapt management package to TCE flavouring. Add new configuration option in x2gothinclient_settings: TC_FLAVOUR (can be: minidesktop or displaymanager). diff --git a/debian/x2gothinclient-minidesktop.install b/debian/x2gothinclient-minidesktop.install index 7884ba5..46b162b 100644 --- a/debian/x2gothinclient-minidesktop.install +++ b/debian/x2gothinclient-minidesktop.install @@ -2,6 +2,6 @@ management/share/etc/x2gothinclient-minidesktop_* etc/x2go/ management/share/etc/x2gothinclient_init.d/95* etc/x2go/x2gothinclient_init.d/ minidesktop/etc/lightdm.conf etc/lightdm/ minidesktop/etc/restart.lightdm etc/lightdm/ -minidesktop/desktop/x2gothinclient-minidesktop.desktop usr/share/applications/ +minidesktop/desktop/x2gothinclient-*.desktop usr/share/applications/ minidesktop/schema-overrides/* usr/share/glib-2.0/schemas/ minidesktop/mate-panel-layout/* usr/share/mate-panel/layouts/ diff --git a/minidesktop/desktop/x2gothinclient-x-www-browser.desktop b/minidesktop/desktop/x2gothinclient-x-www-browser.desktop new file mode 100644 index 0000000..4b50af5 --- /dev/null +++ b/minidesktop/desktop/x2gothinclient-x-www-browser.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Name=Web Browser +Name[pt_BR]=Navegador web +Name[zh_TW]=瀏覽器 +GenericName=X Web Browser +GenericName[pt_BR]=Navegador web gráfico +GenericName[zh_TW]=網頁瀏覽器 +Exec=/usr/bin/x-www-browser %u +Terminal=false +Type=Application +Categories=GTK;WebBrowser;Network +Icon=web-browser +NoDisplay=true diff --git a/minidesktop/mate-panel-layout/x2gothinclient-minidesktop.layout b/minidesktop/mate-panel-layout/x2gothinclient-minidesktop.layout index 4670789..a4646b8 100644 --- a/minidesktop/mate-panel-layout/x2gothinclient-minidesktop.layout +++ b/minidesktop/mate-panel-layout/x2gothinclient-minidesktop.layout @@ -39,7 +39,7 @@ locked=true [Object web-browser] object-type=launcher -launcher-location=/usr/share/applications/x-www-browser.desktop +launcher-location=/usr/share/applications/x2gothinclient-x-www-browser.desktop toplevel-id=bottom position=50 locked=true -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git