Unity

Merge lp:~unity-team/unity/unity.fix-592787-3 into lp:unity

  1. unity.fix-592787-3
  2. Merge into trunk
Proposed by Mirco Müller
Status: Merged
Approved by: Gord Allott
Approved revision: no longer in the source branch.
Merged at revision: 452
Proposed branch: lp:~unity-team/unity/unity.fix-592787-3
Merge into: lp:unity
Diff against target: 25 lines (+4/-4)
1 file modified
unity-private/panel/panel-home-button.vala (+4/-4)
To merge this branch: bzr merge lp:~unity-team/unity/unity.fix-592787-3
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+33242@code.launchpad.net

Description of the change

This is now the third try to get this into unity trunk. Sofar it was always approved. But for some odd reason got reverted or not applied in LP. The commit history of the second try (unity trunk rev. 438) is empty!?!? Fixes LP: 592787.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'unity-private/panel/panel-home-button.vala'
2--- unity-private/panel/panel-home-button.vala 2010-08-18 15:16:46 +0000
3+++ unity-private/panel/panel-home-button.vala 2010-08-20 17:53:42 +0000
4@@ -95,8 +95,8 @@
5 warning ("Could not load active-state bg-texture: %s", e.message);
6 }
7
8- //set_background_for_state (Ctk.ActorState.STATE_NORMAL, bfb_bg_normal);
9- //set_background_for_state (Ctk.ActorState.STATE_PRELIGHT, bfb_bg_prelight);
10+ set_background_for_state (Ctk.ActorState.STATE_NORMAL, bfb_bg_normal);
11+ set_background_for_state (Ctk.ActorState.STATE_PRELIGHT, bfb_bg_prelight);
12 set_background_for_state (Ctk.ActorState.STATE_ACTIVE, bfb_bg_active);
13
14 search_shown = false;
15@@ -186,8 +186,8 @@
16 {
17 if (mode == ShellMode.MINIMIZED)
18 {
19- //set_background_for_state (Ctk.ActorState.STATE_NORMAL, bfb_bg_normal);
20- //set_background_for_state (Ctk.ActorState.STATE_PRELIGHT, bfb_bg_prelight);
21+ set_background_for_state (Ctk.ActorState.STATE_NORMAL, bfb_bg_normal);
22+ set_background_for_state (Ctk.ActorState.STATE_PRELIGHT, bfb_bg_prelight);
23 set_background_for_state (Ctk.ActorState.STATE_ACTIVE, bfb_bg_active);
24 search_shown = false;
25 }