Merge lp:~mterry/libdbusmenu/641209 into lp:libdbusmenu/0.5

Proposed by Michael Terry
Status: Merged
Merged at revision: 301
Proposed branch: lp:~mterry/libdbusmenu/641209
Merge into: lp:libdbusmenu/0.5
Diff against target: 12 lines (+1/-1)
1 file modified
libdbusmenu-glib/client.c (+1/-1)
To merge this branch: bzr merge lp:~mterry/libdbusmenu/641209
Reviewer Review Type Date Requested Status
DBus Menu Team Pending
Review via email: mp+58364@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libdbusmenu-glib/client.c'
--- libdbusmenu-glib/client.c 2011-04-11 04:26:46 +0000
+++ libdbusmenu-glib/client.c 2011-04-19 17:57:17 +0000
@@ -1239,7 +1239,7 @@
1239 } else if (priv->root == NULL) {1239 } else if (priv->root == NULL) {
1240 /* Drop out here, all the rest of these really need to have a root1240 /* Drop out here, all the rest of these really need to have a root
1241 node so we can just ignore them if there isn't one. */1241 node so we can just ignore them if there isn't one. */
1242 } else if (g_strcmp0(signal, "ItemPropertiesUpdated") == 0) {1242 } else if (g_strcmp0(signal, "ItemsPropertiesUpdated") == 0) {
1243 /* Remove before adding just incase there is a duplicate, against the1243 /* Remove before adding just incase there is a duplicate, against the
1244 rules, but we can handle it so let's do it. */1244 rules, but we can handle it so let's do it. */
1245 GVariantIter ritems;1245 GVariantIter ritems;

Subscribers

People subscribed via source and target branches