diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2012-04-11 11:52:21 -0500 |
---|---|---|
committer | Charles Kerr <charles.kerr@canonical.com> | 2012-04-11 11:52:21 -0500 |
commit | f5f01c530c79bff5739a709c26e2d91a3f04b8f3 (patch) | |
tree | 6e94c9e17bd565884faf5731cb649a31699c61bb /libdbusmenu-glib | |
parent | 054d74ead5f54891fd57bf87144554359d367e35 (diff) | |
parent | 286140b9baa7d797654e6f62bbb340527e127412 (diff) | |
download | libdbusmenu-f5f01c530c79bff5739a709c26e2d91a3f04b8f3.tar.gz libdbusmenu-f5f01c530c79bff5739a709c26e2d91a3f04b8f3.tar.bz2 libdbusmenu-f5f01c530c79bff5739a709c26e2d91a3f04b8f3.zip |
Sync from Ubuntu Desktop
Diffstat (limited to 'libdbusmenu-glib')
-rw-r--r-- | libdbusmenu-glib/server.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index 091b243..ebe0082 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -1831,12 +1831,13 @@ bus_about_to_show_group (DbusmenuServer * server, GVariant * params, GDBusMethod gint32 id; GVariantIter iter; GVariantBuilder builder; - - g_variant_iter_init(&iter, params); + + GVariant * items = g_variant_get_child_value(params, 0); + g_variant_iter_init(&iter, items); g_variant_builder_init(&builder, G_VARIANT_TYPE("ai")); gboolean gotone = FALSE; - while (g_variant_iter_loop(&iter, "(i)", &id)) { + while (g_variant_iter_loop(&iter, "i", &id)) { DbusmenuMenuitem * mi = lookup_menuitem_by_id(server, id); if (mi != NULL) { g_timeout_add(0, bus_about_to_show_idle, g_object_ref(mi)); @@ -1872,6 +1873,7 @@ bus_about_to_show_group (DbusmenuServer * server, GVariant * params, GDBusMethod } g_variant_unref(errors); + g_variant_unref(items); return; } |