ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/dbusmenu/send-status-without-error into lp:dbusmenu.

Requested reviews:
  DBus Menu Team (dbusmenu-team)

For more details, see:
https://code.launchpad.net/~ted/dbusmenu/send-status-without-error/+merge/51913

Fixes the parameters to be tuple instead of arrays as the types don't match (as they shouldn't).
-- 
https://code.launchpad.net/~ted/dbusmenu/send-status-without-error/+merge/51913
Your team ayatana-commits is subscribed to branch lp:dbusmenu.

=== modified file 'libdbusmenu-glib/server.c'
--- libdbusmenu-glib/server.c	2011-03-02 11:07:07 +0000
+++ libdbusmenu-glib/server.c	2011-03-02 15:57:38 +0000
@@ -499,7 +499,7 @@
 		/* If the value has changed we need to signal that on DBus */
 		if (priv->text_direction != olddir && priv->bus != NULL && priv->dbusobject != NULL) {
 			GVariantBuilder params;
-			g_variant_builder_init(&params, G_VARIANT_TYPE_ARRAY);
+			g_variant_builder_init(&params, G_VARIANT_TYPE_TUPLE);
 			g_variant_builder_add_value(&params, g_variant_new_string(DBUSMENU_INTERFACE));
 			GVariant * dict = g_variant_new_dict_entry(g_variant_new_string("TextDirection"), g_variant_new_string(dbusmenu_text_direction_get_nick(priv->text_direction)));
 			g_variant_builder_add_value(&params, g_variant_new_array(NULL, &dict, 1));
@@ -523,7 +523,7 @@
 		/* If the value has changed we need to signal that on DBus */
 		if (priv->status != instatus && priv->bus != NULL && priv->dbusobject != NULL) {
 			GVariantBuilder params;
-			g_variant_builder_init(&params, G_VARIANT_TYPE_ARRAY);
+			g_variant_builder_init(&params, G_VARIANT_TYPE_TUPLE);
 			g_variant_builder_add_value(&params, g_variant_new_string(DBUSMENU_INTERFACE));
 			GVariant * dict = g_variant_new_dict_entry(g_variant_new_string("Status"), g_variant_new_string(dbusmenu_status_get_nick(instatus)));
 			g_variant_builder_add_value(&params, g_variant_new_array(NULL, &dict, 1));