Merge lp:~seb128/unity-control-center/define-unity-env into lp:unity-control-center

[Sebastien Bacher]

shell: set XDG_CURRENT_DESKTOP to Unity so the correct list of panels is
included in the grid. The gnome-menus api respects OnlyShowIn, without that
we end up missing most of the panels in other environment (e.g ubiquity).
We can't change the .desktop keys since that would lead to wrong behaviour
in e.g the Unity dash

shell: set XDG_CURRENT_DESKTOP to Unity so the correct list of panels is
included in the grid. The gnome-menus api respects OnlyShowIn, without that
we end up missing most of the panels in other environment (e.g ubiquity).
We can't change the .desktop keys since that would lead to wrong behaviour
in e.g the Unity dash

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:12775
http://jenkins.qa.ubuntu.com/job/unity-control-center-ci/97/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-amd64-ci/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-armhf-ci/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-control-center-trusty-i386-ci/98

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-control-center-ci/97/rebuild

review: Approve (continuous-integration)

[Iain Lane (laney)]

Okay, so there's no way to ignore OnlyShowIn? This is fine then.

review: Approve

[Sebastien Bacher (seb128)]

> Okay, so there's no way to ignore OnlyShowIn? This is fine then.

not that I found no :/ we could probably use another parser than gnome-menus but it feels like like for such changes this cycle

=== modified file 'shell/control-center.c'
--- shell/control-center.c	2014-02-24 17:28:38 +0000
+++ shell/control-center.c	2014-04-10 11:20:01 +0000
@@ -329,6 +329,7 @@
   gtk_icon_size_register ("cc-sidebar-list", 24, 24);
 
   notify_init ("gnome-control-center");
+  g_setenv ("XDG_CURRENT_DESKTOP", "Unity", TRUE);
 
   shell = gnome_control_center_new ();