Merge lp:~htorque/indicator-appmenu/fix-small-leak into lp:indicator-appmenu/0.4

[Hernando Torque]

The inline use of window_menu_dbusmenu_get_address and window_menu_dbusmenu_get_path causes a small leak:

==23569== 6 bytes in 1 blocks are definitely lost in loss record 892 of 13,322
==23569== at 0x4C2B6CD: malloc (vg_replace_malloc.c:263)
==23569== by 0x6938B78: g_malloc (gmem.c:159)
==23569== by 0x694D5CD: g_strdup (gstrfuncs.c:356)
==23569== by 0x18834E78: window_menu_dbusmenu_get_address (window-menu-dbusmenu.c:820)
==23569== by 0x18831E92: bus_method_call (indicator-appmenu.c:1310)
==23569== by 0x5C7FE07: call_in_idle_cb (gdbusconnection.c:4687)
==23569== by 0x6932D89: g_main_context_dispatch (gmain.c:2515)
==23569== by 0x693314F: g_main_context_iterate.isra.23 (gmain.c:3123)
==23569== by 0x6933549: g_main_loop_run (gmain.c:3317)
==23569== by 0x51D5D8C: gtk_main (gtkmain.c:1165)
==23569== by 0x404F71: main (panel-main.c:431)
==23569==
==23569== 28 bytes in 1 blocks are definitely lost in loss record 3,977 of 13,322
==23569== at 0x4C2B6CD: malloc (vg_replace_malloc.c:263)
==23569== by 0x6938B78: g_malloc (gmem.c:159)
==23569== by 0x694D5CD: g_strdup (gstrfuncs.c:356)
==23569== by 0x18834D98: window_menu_dbusmenu_get_path (window-menu-dbusmenu.c:806)
==23569== by 0x18831E77: bus_method_call (indicator-appmenu.c:1310)
==23569== by 0x5C7FE07: call_in_idle_cb (gdbusconnection.c:4687)
==23569== by 0x6932D89: g_main_context_dispatch (gmain.c:2515)
==23569== by 0x693314F: g_main_context_iterate.isra.23 (gmain.c:3123)
==23569== by 0x6933549: g_main_loop_run (gmain.c:3317)
==23569== by 0x51D5D8C: gtk_main (gtkmain.c:1165)
==23569== by 0x404F71: main (panel-main.c:431)

[Charles Kerr (charlesk)]

Looks great, keep 'em coming! :)

review: Approve

=== modified file 'src/indicator-appmenu.c'
--- src/indicator-appmenu.c	2012-03-21 03:35:13 +0000
+++ src/indicator-appmenu.c	2012-03-26 11:49:47 +0000
@@ -1278,8 +1278,12 @@
 	g_variant_builder_init(&builder, G_VARIANT_TYPE_TUPLE);
 
 	if (IS_WINDOW_MENU_DBUSMENU(wm)) {
-		g_variant_builder_add_value(&builder, g_variant_new_string(window_menu_dbusmenu_get_address(WINDOW_MENU_DBUSMENU(wm))));
-		g_variant_builder_add_value(&builder, g_variant_new_object_path(window_menu_dbusmenu_get_path(WINDOW_MENU_DBUSMENU(wm))));
+		gchar * address = window_menu_dbusmenu_get_address(WINDOW_MENU_DBUSMENU(wm));
+		gchar * path = window_menu_dbusmenu_get_path(WINDOW_MENU_DBUSMENU(wm));
+		g_variant_builder_add_value(&builder, g_variant_new_string(address));
+		g_variant_builder_add_value(&builder, g_variant_new_object_path(path));
+		g_free(address);
+		g_free(path);
 	} else {
 		g_variant_builder_add_value(&builder, g_variant_new_string(""));
 		g_variant_builder_add_value(&builder, g_variant_new_object_path("/"));
@@ -1307,10 +1311,14 @@
 		if (value != NULL) {
 			WindowMenu * wm = WINDOW_MENU(value);
 			if (IS_WINDOW_MENU_DBUSMENU(wm)) {
+				gchar * address = window_menu_dbusmenu_get_address(WINDOW_MENU_DBUSMENU(wm));
+				gchar * path = window_menu_dbusmenu_get_path(WINDOW_MENU_DBUSMENU(wm));
 				g_variant_builder_add (&builder, "(uso)",
 				                       window_menu_get_xid(wm),
-				                       window_menu_dbusmenu_get_address(WINDOW_MENU_DBUSMENU(wm)),
-				                       window_menu_dbusmenu_get_path(WINDOW_MENU_DBUSMENU(wm)));
+				                       address,
+				                       path);
+				g_free(address);
+				g_free(path);
 			} else {
 				g_variant_builder_add (&builder, "(uso)",
 				                       window_menu_get_xid(wm),