diff options
| author | Ted Gould <ted@gould.cx> | 2011-01-26 10:57:46 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-01-26 10:57:46 -0600 |
| commit | 8e2a3bfea1b063a89592127eabda018e48be1b5d (patch) | |
| tree | a071b4b5858206aa500a8981efe65639cc41ebac | |
| parent | a631bdcb32b183519b3f964c1b54aff77204237a (diff) | |
| parent | ea502b22c0b3d34e58e0db774d5edfd28b7f2d41 (diff) | |
| download | libdbusmenu-8e2a3bfea1b063a89592127eabda018e48be1b5d.tar.gz libdbusmenu-8e2a3bfea1b063a89592127eabda018e48be1b5d.tar.bz2 libdbusmenu-8e2a3bfea1b063a89592127eabda018e48be1b5d.zip | |
* Upstream Merge
* Making explicit use of tuple to make more robust
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-glib/server.c | 8 |
2 files changed, 14 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index e482846..68deef3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.3.93-0ubuntu2~ted6) UNRELEASED; urgency=low + + * Upstream Merge + * Making explicit use of tuple to make more robust + + -- Ted Gould <ted@ubuntu.com> Wed, 26 Jan 2011 10:57:14 -0600 + libdbusmenu (0.3.93-0ubuntu2~ted5) natty; urgency=low * Upstream Merge diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index dda0c09..b6e5fa1 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -975,11 +975,17 @@ serialize_menuitem(gpointer data, gpointer user_data) { DbusmenuMenuitem * mi = DBUSMENU_MENUITEM(data); GVariantBuilder * builder = (GVariantBuilder *)(user_data); + GVariantBuilder tuple; + + g_variant_builder_init(&tuple, G_VARIANT_TYPE_TUPLE); gint id = dbusmenu_menuitem_get_id(mi); + g_variant_builder_add_value(&tuple, g_variant_new_int32(id)); + GVariant * props = dbusmenu_menuitem_properties_variant(mi); + g_variant_builder_add_value(&tuple, props); - g_variant_builder_add(builder, "(ia{sv})", id, props); + g_variant_builder_add_value(builder, g_variant_builder_end(&tuple)); return; } |