ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Martin Pitt (pitti)
Related merge proposals:
  https://code.launchpad.net/~pitti/dbusmenu/fix-dbusmenu-dumper/+merge/49992
  proposed by: Martin Pitt (pitti)
  review: Approve - Ted Gould (ted)
------------------------------------------------------------
revno: 210 [merge]
committer: Ted Gould <ted@xxxxxxxx>
branch nick: trunk
timestamp: Wed 2011-02-16 16:00:16 -0600
message:
  Fixing the GVariant signatures on dbusmenu-dumper
modified:
  tools/dbusmenu-dumper.c


--
lp:dbusmenu
https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk

Your team ayatana-commits is subscribed to branch lp:dbusmenu.
To unsubscribe from this branch go to https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk/+edit-subscription

=== modified file 'tools/dbusmenu-dumper.c'
--- tools/dbusmenu-dumper.c	2011-01-13 15:53:15 +0000
+++ tools/dbusmenu-dumper.c	2011-02-16 15:59:17 +0000
@@ -270,10 +270,12 @@
 
 	error = NULL;
 	GVariant * retval;
+	GVariant * args[1];
+	args[0] = g_variant_new("u", window);
 
 	retval = g_dbus_proxy_call_sync(proxy,
 	                                "GetMenuForWindow",
-	                                g_variant_new("u", window),
+	                                g_variant_new_tuple(args, 1),
 	                                G_DBUS_CALL_FLAGS_NONE,
 	                                -1,
 	                                NULL,
@@ -285,7 +287,7 @@
 		return FALSE;
 	}
 
-	g_variant_get(retval, "so", &dbusname, &dbusobject);
+	g_variant_get(retval, "(so)", &dbusname, &dbusobject);
 
 	g_variant_unref(retval);
 	g_object_unref(proxy);