Merge lp:~ted/libdbusmenu/743661 into lp:libdbusmenu/0.5

Proposed by Ted Gould on 2011-09-23
Status: Merged
Merged at revision: 337
Proposed branch: lp:~ted/libdbusmenu/743661
Merge into: lp:libdbusmenu/0.5
Diff against target: 15 lines (+4/-0)
1 file modified
libdbusmenu-glib/client.c (+4/-0)
To merge this branch: bzr merge lp:~ted/libdbusmenu/743661
Reviewer Review Type Date Requested Status
Andrea Cimitan (community) Approve on 2011-09-27
DBus Menu Team 2011-09-23 Pending
Review via email: mp+76805@code.launchpad.net

Description of the change

Protect the about-to-show from the client

To post a comment you must log in.
Andrea Cimitan (cimi) wrote :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libdbusmenu-glib/client.c'
2--- libdbusmenu-glib/client.c 2011-04-19 17:54:37 +0000
3+++ libdbusmenu-glib/client.c 2011-09-23 20:44:24 +0000
4@@ -1604,7 +1604,11 @@
5 void
6 dbusmenu_client_send_about_to_show(DbusmenuClient * client, gint id, void (*cb)(gpointer data), gpointer cb_data)
7 {
8+ g_return_if_fail(DBUSMENU_CLIENT(client));
9+ g_return_if_fail(id > 0);
10+
11 DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
12+ g_return_if_fail(priv != NULL);
13
14 about_to_show_t * data = g_new0(about_to_show_t, 1);
15 data->client = client;

Subscribers

People subscribed via source and target branches