Merge lp:~ted/libdbusmenu/about-to-show-tuple into lp:libdbusmenu/0.6

Proposed by Ted Gould
Status: Merged
Approved by: Charles Kerr
Approved revision: 403
Merged at revision: 406
Proposed branch: lp:~ted/libdbusmenu/about-to-show-tuple
Merge into: lp:libdbusmenu/0.6
Diff against target: 28 lines (+5/-3)
1 file modified
libdbusmenu-glib/server.c (+5/-3)
To merge this branch: bzr merge lp:~ted/libdbusmenu/about-to-show-tuple
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Review via email: mp+101248@code.launchpad.net

Description of the change

Fixing about-to-show grouping. Not sure why this didn't happen in the unit tests, but for now, focusing on getting the fix out.

To post a comment you must log in.
Revision history for this message
Charles Kerr (charlesk) wrote :

Good catch!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libdbusmenu-glib/server.c'
--- libdbusmenu-glib/server.c 2012-03-30 21:23:39 +0000
+++ libdbusmenu-glib/server.c 2012-04-09 15:15:25 +0000
@@ -1831,12 +1831,13 @@
1831 gint32 id;1831 gint32 id;
1832 GVariantIter iter;1832 GVariantIter iter;
1833 GVariantBuilder builder;1833 GVariantBuilder builder;
1834 1834
1835 g_variant_iter_init(&iter, params);1835 GVariant * items = g_variant_get_child_value(params, 0);
1836 g_variant_iter_init(&iter, items);
1836 g_variant_builder_init(&builder, G_VARIANT_TYPE("ai"));1837 g_variant_builder_init(&builder, G_VARIANT_TYPE("ai"));
1837 gboolean gotone = FALSE;1838 gboolean gotone = FALSE;
18381839
1839 while (g_variant_iter_loop(&iter, "(i)", &id)) {1840 while (g_variant_iter_loop(&iter, "i", &id)) {
1840 DbusmenuMenuitem * mi = lookup_menuitem_by_id(server, id);1841 DbusmenuMenuitem * mi = lookup_menuitem_by_id(server, id);
1841 if (mi != NULL) {1842 if (mi != NULL) {
1842 g_timeout_add(0, bus_about_to_show_idle, g_object_ref(mi));1843 g_timeout_add(0, bus_about_to_show_idle, g_object_ref(mi));
@@ -1872,6 +1873,7 @@
1872 }1873 }
18731874
1874 g_variant_unref(errors);1875 g_variant_unref(errors);
1876 g_variant_unref(items);
18751877
1876 return;1878 return;
1877}1879}

Subscribers

People subscribed via source and target branches

to all changes: