Merge lp:~gaul/unity/on_entry_added_leak_5.0 into lp:unity/5.0

[Andrew Gaul]

PanelService: Disconnect signals connected in on_entry_added when removing an entry

[Marco Trevisan (Treviño) (3v1n0)]

Cool, thanks however a couple of things: could you move this block above the comment block? And I think that it should be added the same also inside the for loop of panel_service_actually_remove_indicator

[Christopher Townsend (townsend)]

I'm going to mark this Needs Fixing based on Marco's comments.

review: Needs Fixing

[Andrew Gaul (gaul)]

Sorry I have not responded earlier; I will address these comments in trunk first then update this merge request.

[Marco Trevisan (Treviño) (3v1n0)]

Hi Andrew, no need to send the change in trunk (it's already there). Adding the change to this branch is enough.

Thanks.

[Marco Trevisan (Treviño) (3v1n0)]

As I don't see updates on this branch, I've fixed the missing bits and pushed this to lp:unity/5.0. Thanks for the contribution anyway Andrew! ;)

review: Approve

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2012-04-13 09:11:31 +0000
+++ services/panel-service.c	2013-07-24 18:22:27 +0000
@@ -882,6 +882,15 @@
    * FIXME this in libappmenu.so to avoid to send an "entry-removed" signal
    * when switching the focus from a window to one of its dialog children */
 
+  if (GTK_IS_LABEL (entry->label))
+    {
+      g_signal_handlers_disconnect_by_data (entry->label, object);
+    }
+  if (GTK_IS_IMAGE (entry->image))
+    {
+      g_signal_handlers_disconnect_by_data (entry->image, object);
+    }
+
   gchar *entry_id = get_indicator_entry_id_by_entry (entry);
   g_hash_table_remove (self->priv->id2entry_hash, entry_id);
   g_free (entry_id);