Merge lp:~mterry/indicator-appmenu/double-ref-of-entry-label into lp:indicator-appmenu/0.3

[Michael Terry]

indicator-appmenu is creating a label for an IndicatorObjectEntry object then immediately ref'ing it. I believe this is because it wants to own the label and have it persist across container adds/removes.

Which works if it is added to a container. (the container will then claim the floating ref and remove it when done). But if not added to a container (and I can't see where that happens, so I'm guessing it doesn't?...), the floating ref will never be claimed and memory will be leaked.

It's better to just sink the ref ourselves. That way, we own the floating ref and free it, and other containers or users of the label can use normal ref semantics.

=== modified file 'src/window-menus.c'
--- src/window-menus.c	2011-09-23 21:01:19 +0000
+++ src/window-menus.c	2011-10-05 18:17:25 +0000
@@ -742,7 +742,7 @@
 	entry->label = GTK_LABEL(gtk_label_new_with_mnemonic(dbusmenu_menuitem_property_get(newentry, DBUSMENU_MENUITEM_PROP_LABEL)));
 
 	if (entry->label != NULL) {
-		g_object_ref(entry->label);
+		g_object_ref_sink(entry->label);
 	}
 
 	entry->accessible_desc = dbusmenu_menuitem_property_get(newentry, DBUSMENU_MENUITEM_PROP_LABEL);