Merge lp:~jbicha/ubuntuone-control-panel/dont-show-in-gnome-system-settings into lp:ubuntuone-control-panel

[Jeremy Bícha]

Don't show Ubuntu One in System Settings when running GNOME.

For the Ubuntu GNOME Remix, we want to showcase a pure GNOME experience on Ubuntu. We'd like to hide the extra System Settings panels Ubuntu has hacked on. Ubuntu One will still be accessible from GNOME Shell's Activities Overview (their version of Unity's Dash).

Remember to add the new .desktop to debian/ubuntuone-control-panel-qt.install when you package this.

Thanks!

[lp:~jbicha/ubuntuone-control-panel/dont-show-in-gnome-system-settings]

380. By Jeremy Bícha on 2012-11-08

fix the GNOME .desktop so that it doesn't show in System Settings

381. By Jeremy Bícha on 2012-11-08

don't use "installer" in the name of the new .desktop

[dobey (dobey)]

review: Approve

=== added file 'ubuntuone-control-panel-qt-gnome.desktop.in'
--- ubuntuone-control-panel-qt-gnome.desktop.in	1970-01-01 00:00:00 +0000
+++ ubuntuone-control-panel-qt-gnome.desktop.in	2012-11-08 15:04:25 +0000
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Ubuntu One
+_Comment=Configure and manage your Ubuntu One account
+Exec=ubuntuone-control-panel-qt
+Icon=ubuntuone
+Terminal=false
+Type=Application
+OnlyShowIn=GNOME;
+Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-PersonalSettings
+StartupNotify=true
+X-Ayatana-Appmenu-Show-Stubs=False

=== modified file 'ubuntuone-installer.desktop.in'
--- ubuntuone-installer.desktop.in	2012-09-10 14:12:04 +0000
+++ ubuntuone-installer.desktop.in	2012-11-08 15:04:25 +0000
@@ -5,6 +5,7 @@
 Icon=ubuntuone
 Terminal=false
 Type=Application
+NotShowIn=GNOME;
 Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings
 StartupNotify=true
 X-Ayatana-Appmenu-Show-Stubs=False