Unity

Merge lp:~cimi/unity/fix-window-decorations-ambiance-maverick into lp:unity

  1. fix-window-decorations-ambiance-maverick
  2. Merge into trunk
Proposed by Andrea Cimitan
Status: Merged
Merged at revision: 518
Proposed branch: lp:~cimi/unity/fix-window-decorations-ambiance-maverick
Merge into: lp:unity
Diff against target: 30 lines (+1/-8)
1 file modified
unity-private/panel/panel-window-buttons.vala (+1/-8)
To merge this branch: bzr merge lp:~cimi/unity/fix-window-decorations-ambiance-maverick
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Review via email: mp+35861@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Neil J. Patel (njpatel) wrote :

Looks good. Approved and merged!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'unity-private/panel/panel-window-buttons.vala'
2--- unity-private/panel/panel-window-buttons.vala 2010-08-26 09:57:15 +0000
3+++ unity-private/panel/panel-window-buttons.vala 2010-09-17 18:21:03 +0000
4@@ -197,13 +197,11 @@
5 public class WindowButton : Ctk.Button
6 {
7 public static const string AMBIANCE = "/usr/share/themes/Ambiance/metacity-1";
8- public static const string AMBIANCE_BETA = "/usr/share/themes/Ambiance-maverick-beta/metacity-1";
9
10 public string filename { get; construct; }
11 public Clutter.Actor bg;
12
13- private bool using_beta = false;
14- private int icon_size = 18;
15+ private int icon_size = 19;
16 private string directory = AMBIANCE;
17
18 public WindowButton (string filename)
19@@ -213,11 +211,6 @@
20
21 construct
22 {
23- if (using_beta = FileUtils.test (AMBIANCE_BETA, FileTest.EXISTS))
24- {
25- icon_size = 19;
26- directory = AMBIANCE_BETA;
27- }
28 try {
29 bg = new Ctk.Image.from_filename (icon_size,
30 directory +