Unity

Merge lp:~unity-team/unity/unity.fix-correct-destructor-name into lp:unity

  1. unity.fix-correct-destructor-name
  2. Merge into trunk
Proposed by Jay Taoko
Status: Merged
Approved by: Gord Allott
Approved revision: no longer in the source branch.
Merged at revision: 523
Proposed branch: lp:~unity-team/unity/unity.fix-correct-destructor-name
Merge into: lp:unity
Diff against target: 55 lines (+9/-3)
4 files modified
unity-private/launcher/quicklist-check-menu-item.vala (+1/-1)
unity-private/launcher/quicklist-image-menu-item.vala (+1/-1)
unity-private/launcher/quicklist-radio-menu-item.vala (+1/-1)
unity-private/launcher/quicklist-seperator-menu-item.vala (+6/-0)
To merge this branch: bzr merge lp:~unity-team/unity/unity.fix-correct-destructor-name
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+36102@code.launchpad.net

Description of the change

Add correct destructor name to menu items classes.

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/launcher/quicklist-check-menu-item.vala'
2--- unity-private/launcher/quicklist-check-menu-item.vala 2010-09-02 20:12:52 +0000
3+++ unity-private/launcher/quicklist-check-menu-item.vala 2010-09-21 05:03:44 +0000
4@@ -203,7 +203,7 @@
5 return true;
6 }
7
8- ~QuicklistMenuItem ()
9+ ~QuicklistCheckMenuItem ()
10 {
11 this.notify["label"].disconnect (this._on_label_changed);
12 this.enter_event.disconnect (this._on_enter);
13
14=== modified file 'unity-private/launcher/quicklist-image-menu-item.vala'
15--- unity-private/launcher/quicklist-image-menu-item.vala 2010-09-02 20:12:52 +0000
16+++ unity-private/launcher/quicklist-image-menu-item.vala 2010-09-21 05:03:44 +0000
17@@ -200,7 +200,7 @@
18 return true;
19 }
20
21- ~QuicklistMenuItem ()
22+ ~QuicklistImageMenuItem ()
23 {
24 this.notify["label"].disconnect (this._on_label_changed);
25 this.enter_event.disconnect (this._on_enter);
26
27=== modified file 'unity-private/launcher/quicklist-radio-menu-item.vala'
28--- unity-private/launcher/quicklist-radio-menu-item.vala 2010-09-02 20:12:52 +0000
29+++ unity-private/launcher/quicklist-radio-menu-item.vala 2010-09-21 05:03:44 +0000
30@@ -201,7 +201,7 @@
31 return true;
32 }
33
34- ~QuicklistMenuItem ()
35+ ~QuicklistRadioMenuItem ()
36 {
37 this.notify["label"].disconnect (this._on_label_changed);
38 this.enter_event.disconnect (this._on_enter);
39
40=== modified file 'unity-private/launcher/quicklist-seperator-menu-item.vala'
41--- unity-private/launcher/quicklist-seperator-menu-item.vala 2010-07-16 12:36:32 +0000
42+++ unity-private/launcher/quicklist-seperator-menu-item.vala 2010-09-21 05:03:44 +0000
43@@ -122,6 +122,12 @@
44 return false;
45 }
46
47+ ~QuicklistMenuSeperator ()
48+ {
49+ if (this.seperator_background is Clutter.Actor)
50+ this.seperator_background.unparent ();
51+ }
52+
53 construct
54 {
55 Ctk.Padding padding = Ctk.Padding () {