From 3f5e75c04af6960faa38b676755abbfdc210fa4e Mon Sep 17 00:00:00 2001 From: Neil Jagdish Patel Date: Thu, 2 Sep 2010 16:12:52 -0400 Subject: Correctly free child actors (bzr r479.1.2) --- unity-private/launcher/quicklist-check-menu-item.vala | 3 +++ unity-private/launcher/quicklist-image-menu-item.vala | 3 +++ unity-private/launcher/quicklist-menu-item.vala | 5 +++++ unity-private/launcher/quicklist-radio-menu-item.vala | 3 +++ 4 files changed, 14 insertions(+) (limited to 'unity-private') diff --git a/unity-private/launcher/quicklist-check-menu-item.vala b/unity-private/launcher/quicklist-check-menu-item.vala index e503cad05..9a001de84 100644 --- a/unity-private/launcher/quicklist-check-menu-item.vala +++ b/unity-private/launcher/quicklist-check-menu-item.vala @@ -209,6 +209,9 @@ namespace Unity.Launcher this.enter_event.disconnect (this._on_enter); this.leave_event.disconnect (this._on_leave); this.button_press_event.disconnect (this._on_mouse_down); + + if (this.item_background is Clutter.Actor) + this.item_background.unparent (); } construct diff --git a/unity-private/launcher/quicklist-image-menu-item.vala b/unity-private/launcher/quicklist-image-menu-item.vala index 806f071b0..566b9b63b 100644 --- a/unity-private/launcher/quicklist-image-menu-item.vala +++ b/unity-private/launcher/quicklist-image-menu-item.vala @@ -206,6 +206,9 @@ namespace Unity.Launcher this.enter_event.disconnect (this._on_enter); this.leave_event.disconnect (this._on_leave); this.button_press_event.disconnect (this._on_mouse_down); + + if (this.item_background is Clutter.Actor) + this.item_background.unparent (); } construct diff --git a/unity-private/launcher/quicklist-menu-item.vala b/unity-private/launcher/quicklist-menu-item.vala index 0a6b62ee6..33fe98973 100644 --- a/unity-private/launcher/quicklist-menu-item.vala +++ b/unity-private/launcher/quicklist-menu-item.vala @@ -149,6 +149,8 @@ namespace Unity.Launcher this.item_background.add_layer (normal_layer); this.item_background.add_layer (selected_layer); + debug ("\n\n\n %u %u\n\n\n\n", normal_layer.ref_count, selected_layer.ref_count); + this.item_background.get_layer(0).set_enabled (true); this.item_background.get_layer(1).set_enabled (false); if (this.get_stage () is Clutter.Stage) @@ -218,6 +220,9 @@ namespace Unity.Launcher this.enter_event.disconnect (this._on_enter); this.leave_event.disconnect (this._on_leave); this.button_press_event.disconnect (this._on_mouse_down); + + if (this.item_background is Clutter.Actor) + this.item_background.unparent (); } construct diff --git a/unity-private/launcher/quicklist-radio-menu-item.vala b/unity-private/launcher/quicklist-radio-menu-item.vala index e9b826c31..dac90fcc6 100644 --- a/unity-private/launcher/quicklist-radio-menu-item.vala +++ b/unity-private/launcher/quicklist-radio-menu-item.vala @@ -207,6 +207,9 @@ namespace Unity.Launcher this.enter_event.disconnect (this._on_enter); this.leave_event.disconnect (this._on_leave); this.button_press_event.disconnect (this._on_mouse_down); + + if (this.item_background is Clutter.Actor) + this.item_background.unparent (); } construct -- cgit v1.2.3