Merge lp:~mterry/indicator-appmenu/one-too-many-refs into lp:indicator-appmenu/0.3

[Michael Terry]

In the course of tracking down the memory in bug 835646, I found this leak. It fixes part of the problem, but seemingly not all of it.

The problem here is that a ref is made before a call, thinking the call will unref it. But it doesn't. The call does a ref/unref pair.

(it's slightly more complicated than that. the call thinks that by disconnecting a signal, it will unref a ref that it expects to be made by the outer function (thus, reffing once and unreffing twice) -- but this particular code path doesn't do that, so the outer function ref isn't needed)

[Michael Terry (mterry)]

(and I threw in a Makefile.am fix for free)

[lp:~mterry/indicator-appmenu/one-too-many-refs]

129. By Michael Terry on 2011-09-23

don't add an extra ref for new menuitems

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-01-12 23:59:56 +0000
+++ src/Makefile.am	2011-09-23 21:05:15 +0000
@@ -45,14 +45,14 @@
 
 gen-%.xml.c: %.xml
 	@echo "Building $@ from $<"
-	@echo "const char * _$(subst -,_,$(subst .,_,$(basename $<))) = " > $@
+	@echo "const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<)))) = " > $@
 	@$(XSLT_PROC) $(srcdir)/clean-namespaces.xslt $< | \
 		sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": >> $@
 	@echo ";" >> $@
 
 gen-%.xml.h: %.xml
 	@echo "Building $@ from $<"
-	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $<)));" > $@
+	@echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $(notdir $<))));" > $@
 
 BUILT_SOURCES += \
 	gen-application-menu-renderer.xml.c \
 
=== modified file 'src/window-menus.c'
--- src/window-menus.c	2011-06-07 19:38:59 +0000
+++ src/window-menus.c	2011-09-23 21:05:15 +0000
@@ -669,10 +669,10 @@
 	} else {
 		gpointer * data = g_new(gpointer, 2);
 		data[0] = user_data;
-		data[1] = g_object_ref(newentry);
-		/* child_realized does an unref */
+		data[1] = newentry;
 
 		menu_child_realized(NULL, data);
+		g_free (data);
 	}
 	
 	return;