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
=== modified file 'unity-private/launcher/quicklist-check-menu-item.vala'
--- unity-private/launcher/quicklist-check-menu-item.vala 2010-09-02 20:12:52 +0000
+++ unity-private/launcher/quicklist-check-menu-item.vala 2010-09-21 05:03:44 +0000
@@ -203,7 +203,7 @@
203 return true;203 return true;
204 }204 }
205205
206 ~QuicklistMenuItem ()206 ~QuicklistCheckMenuItem ()
207 {207 {
208 this.notify["label"].disconnect (this._on_label_changed);208 this.notify["label"].disconnect (this._on_label_changed);
209 this.enter_event.disconnect (this._on_enter);209 this.enter_event.disconnect (this._on_enter);
210210
=== modified file 'unity-private/launcher/quicklist-image-menu-item.vala'
--- unity-private/launcher/quicklist-image-menu-item.vala 2010-09-02 20:12:52 +0000
+++ unity-private/launcher/quicklist-image-menu-item.vala 2010-09-21 05:03:44 +0000
@@ -200,7 +200,7 @@
200 return true;200 return true;
201 }201 }
202202
203 ~QuicklistMenuItem ()203 ~QuicklistImageMenuItem ()
204 {204 {
205 this.notify["label"].disconnect (this._on_label_changed);205 this.notify["label"].disconnect (this._on_label_changed);
206 this.enter_event.disconnect (this._on_enter);206 this.enter_event.disconnect (this._on_enter);
207207
=== modified file 'unity-private/launcher/quicklist-radio-menu-item.vala'
--- unity-private/launcher/quicklist-radio-menu-item.vala 2010-09-02 20:12:52 +0000
+++ unity-private/launcher/quicklist-radio-menu-item.vala 2010-09-21 05:03:44 +0000
@@ -201,7 +201,7 @@
201 return true;201 return true;
202 }202 }
203203
204 ~QuicklistMenuItem ()204 ~QuicklistRadioMenuItem ()
205 {205 {
206 this.notify["label"].disconnect (this._on_label_changed);206 this.notify["label"].disconnect (this._on_label_changed);
207 this.enter_event.disconnect (this._on_enter);207 this.enter_event.disconnect (this._on_enter);
208208
=== modified file 'unity-private/launcher/quicklist-seperator-menu-item.vala'
--- unity-private/launcher/quicklist-seperator-menu-item.vala 2010-07-16 12:36:32 +0000
+++ unity-private/launcher/quicklist-seperator-menu-item.vala 2010-09-21 05:03:44 +0000
@@ -122,6 +122,12 @@
122 return false;122 return false;
123 }123 }
124124
125 ~QuicklistMenuSeperator ()
126 {
127 if (this.seperator_background is Clutter.Actor)
128 this.seperator_background.unparent ();
129 }
130
125 construct131 construct
126 {132 {
127 Ctk.Padding padding = Ctk.Padding () {133 Ctk.Padding padding = Ctk.Padding () {