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

Proposed by Sebastien Bacher on 2014-04-10
Status: Merged
Approved by: Iain Lane on 2014-04-10
Approved revision: 12775
Merged at revision: 12775
Proposed branch: lp:~seb128/unity-control-center/define-unity-env
Merge into: lp:unity-control-center
Diff against target: 10 lines (+1/-0)
1 file modified
shell/control-center.c (+1/-0)
To merge this branch: bzr merge lp:~seb128/unity-control-center/define-unity-env
Reviewer Review Type Date Requested Status
Iain Lane 2014-04-10 Approve on 2014-04-10
PS Jenkins bot (community) continuous-integration Approve on 2014-04-10
Unity Control Center development team 2014-04-10 Pending
Review via email: mp+215153@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Iain Lane (laney) wrote :

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

review: Approve
Sebastien Bacher (seb128) wrote :

> 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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'shell/control-center.c'
2--- shell/control-center.c 2014-02-24 17:28:38 +0000
3+++ shell/control-center.c 2014-04-10 11:20:01 +0000
4@@ -329,6 +329,7 @@
5 gtk_icon_size_register ("cc-sidebar-list", 24, 24);
6
7 notify_init ("gnome-control-center");
8+ g_setenv ("XDG_CURRENT_DESKTOP", "Unity", TRUE);
9
10 shell = gnome_control_center_new ();
11

Subscribers

People subscribed via source and target branches