DBus Menu

Merge lp:~ken-vandine/libdbusmenu/lp_862989 into lp:libdbusmenu/0.5

  1. lp_862989
  2. Merge into trunk
Proposed by Ken VanDine
Status: Merged
Approved by: Ted Gould
Approved revision: 341
Merged at revision: 343
Proposed branch: lp:~ken-vandine/libdbusmenu/lp_862989
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:~ken-vandine/libdbusmenu/lp_862989
Reviewer Review Type Date Requested Status
Andrea Cimitan (community) Approve
DBus Menu Team Pending
Review via email: mp+77711@code.launchpad.net

Description of the change

id of 0 in dbusmenu_client_send_about_to_show is valid, and used in appindicators like nm-applet (LP: #862989)

To post a comment you must log in.
Revision history for this message
Andrea Cimitan (cimi) :
review: Approve

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-09-29 19:33:58 +0000
+++ libdbusmenu-glib/client.c 2011-09-30 14:26:24 +0000
@@ -1610,7 +1610,7 @@
1610dbusmenu_client_send_about_to_show(DbusmenuClient * client, gint id, void (*cb)(gpointer data), gpointer cb_data)1610dbusmenu_client_send_about_to_show(DbusmenuClient * client, gint id, void (*cb)(gpointer data), gpointer cb_data)
1611{1611{
1612 g_return_if_fail(DBUSMENU_CLIENT(client));1612 g_return_if_fail(DBUSMENU_CLIENT(client));
1613 g_return_if_fail(id > 0);1613 g_return_if_fail(id >= 0);
16141614
1615 DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);1615 DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
1616 g_return_if_fail(priv != NULL);1616 g_return_if_fail(priv != NULL);

Subscribers

People subscribed via source and target branches