DBus Menu

Merge lp:~ted/libdbusmenu/send-status-without-error into lp:libdbusmenu/0.5

  1. send-status-without-error
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merged at revision: 253
Proposed branch: lp:~ted/libdbusmenu/send-status-without-error
Merge into: lp:libdbusmenu/0.5
Diff against target: 21 lines (+2/-2)
1 file modified
libdbusmenu-glib/server.c (+2/-2)
To merge this branch: bzr merge lp:~ted/libdbusmenu/send-status-without-error
Reviewer Review Type Date Requested Status
Conor Curran (community) Approve
Review via email: mp+51913@code.launchpad.net

Description of the change

Fixes the parameters to be tuple instead of arrays as the types don't match (as they shouldn't).

To post a comment you must log in.
Revision history for this message
Conor Curran (cjcurran) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libdbusmenu-glib/server.c'
2--- libdbusmenu-glib/server.c 2011-03-02 11:07:07 +0000
3+++ libdbusmenu-glib/server.c 2011-03-02 15:57:38 +0000
4@@ -499,7 +499,7 @@
5 /* If the value has changed we need to signal that on DBus */
6 if (priv->text_direction != olddir && priv->bus != NULL && priv->dbusobject != NULL) {
7 GVariantBuilder params;
8- g_variant_builder_init(&params, G_VARIANT_TYPE_ARRAY);
9+ g_variant_builder_init(&params, G_VARIANT_TYPE_TUPLE);
10 g_variant_builder_add_value(&params, g_variant_new_string(DBUSMENU_INTERFACE));
11 GVariant * dict = g_variant_new_dict_entry(g_variant_new_string("TextDirection"), g_variant_new_string(dbusmenu_text_direction_get_nick(priv->text_direction)));
12 g_variant_builder_add_value(&params, g_variant_new_array(NULL, &dict, 1));
13@@ -523,7 +523,7 @@
14 /* If the value has changed we need to signal that on DBus */
15 if (priv->status != instatus && priv->bus != NULL && priv->dbusobject != NULL) {
16 GVariantBuilder params;
17- g_variant_builder_init(&params, G_VARIANT_TYPE_ARRAY);
18+ g_variant_builder_init(&params, G_VARIANT_TYPE_TUPLE);
19 g_variant_builder_add_value(&params, g_variant_new_string(DBUSMENU_INTERFACE));
20 GVariant * dict = g_variant_new_dict_entry(g_variant_new_string("Status"), g_variant_new_string(dbusmenu_status_get_nick(instatus)));
21 g_variant_builder_add_value(&params, g_variant_new_array(NULL, &dict, 1));

Subscribers

People subscribed via source and target branches