ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~mterry/dbusmenu/fix-props-return into lp:dbusmenu with lp:~mterry/dbusmenu/submenus as a prerequisite.

Requested reviews:
  DBus Menu Team (dbusmenu-team)

For more details, see:
https://code.launchpad.net/~mterry/dbusmenu/fix-props-return/+merge/48026

Seems like the variant type signature is wrong in this one case. (noticed in nm-applet output)
-- 
https://code.launchpad.net/~mterry/dbusmenu/fix-props-return/+merge/48026
Your team ayatana-commits is subscribed to branch lp:dbusmenu.

=== modified file 'libdbusmenu-glib/server.c'
--- libdbusmenu-glib/server.c	2011-01-26 17:12:04 +0000
+++ libdbusmenu-glib/server.c	2011-01-31 17:51:32 +0000
@@ -946,9 +946,9 @@
 		ret = g_variant_builder_end(&builder);
 	} else {
 		GError * error = NULL;
-		ret = g_variant_parse(g_variant_type_new("a(ia(sv))"), "[]", NULL, NULL, NULL);
+		ret = g_variant_parse(g_variant_type_new("a(ia{sv})"), "[]", NULL, NULL, NULL);
 		if (error != NULL) {
-			g_warning("Unable to parse '[]' as a 'a(ia(sv))': %s", error->message);
+			g_warning("Unable to parse '[]' as a 'a(ia{sv})': %s", error->message);
 			g_error_free(error);
 			ret = NULL;
 		}