Merge lp:~robert-ancell/landscape-client/unity-control-center2 into lp:~landscape/landscape-client/trunk

[Robert Ancell]

Show landscape-client entry in both GNOME control center and Unity control center.

Show in both GNOME control center and Unity control center

[Alberto Donato (ack)]

Hi Robert, does this branch supersede lp:~robert-ancell/landscape-client/desktop-file ?

[Robert Ancell (robert-ancell)]

> Hi Robert, does this branch supersede lp:~robert-ancell/landscape-client
> /desktop-file ?

This branch has those changes in it so landing this one effectively lands the other one.

[Adam Collard (adam-collard)]

-OnlyShowIn=GNOME;Unity;

Sorry, I didn't manage to successfully follow the thread on the mailing list - does this change mean Landscape will only appear in the control centre for (vanilla) Ubuntu and not Ubuntu-GNOME?

review: Needs Information

[Adam Collard (adam-collard)]

> > Hi Robert, does this branch supersede lp:~robert-ancell/landscape-client
> > /desktop-file ?
>
> This branch has those changes in it so landing this one effectively lands the
> other one.

It would be good if you could resubmit this MP with the former branch set as a pre-req so that LP will separate the two diffs.

[Robert Ancell (robert-ancell)]

> -OnlyShowIn=GNOME;Unity;
>
> Sorry, I didn't manage to successfully follow the thread on the mailing list -
> does this change mean Landscape will only appear in the control centre for
> (vanilla) Ubuntu and not Ubuntu-GNOME?

Good catch - I have changed this back to "GNOME;Unity;" - I was testing only showing in Unity before but now all the modifications show in both. We can decide at a later date once the migration is complete if these should show in Ubuntu GNOME.

[Adam Collard (adam-collard)]

Looks great! +1

Thanks for tidying up the MP

review: Approve

[Alberto Donato (ack)]

+1, Looks good

review: Approve

=== modified file 'applications/landscape-client-settings.desktop.in'
--- applications/landscape-client-settings.desktop.in	2014-01-15 19:28:08 +0000
+++ applications/landscape-client-settings.desktop.in	2014-01-15 19:28:08 +0000
@@ -6,7 +6,8 @@
 Terminal=False
 Type=Application
 StartupNotify=true
-Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel;
+Categories=GNOME;GTK;Settings;X-GNOME-SystemSettings;X-GNOME-Settings-Panel;X-Unity-Settings-Panel;
 OnlyShowIn=GNOME;Unity;
+X-Unity-Settings-Panel=landscape
 X-GNOME-Settings-Panel=landscape
 X-Ubuntu-Gettext-Domain=landscape-client