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

Proposed by Ted Gould on 2011-09-23
Status: Merged
Merged at revision: 338
Proposed branch: lp:~ted/libdbusmenu/743050
Merge into: lp:libdbusmenu/0.5
Diff against target: 12 lines (+1/-1)
1 file modified
libdbusmenu-glib/menuitem.c (+1/-1)
To merge this branch: bzr merge lp:~ted/libdbusmenu/743050
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+76810@code.launchpad.net

Description of the change

Protect against a null class

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libdbusmenu-glib/menuitem.c'
2--- libdbusmenu-glib/menuitem.c 2011-06-17 17:53:03 +0000
3+++ libdbusmenu-glib/menuitem.c 2011-09-23 21:07:25 +0000
4@@ -1730,7 +1730,7 @@
5 #endif
6 DbusmenuMenuitemClass * class = DBUSMENU_MENUITEM_GET_CLASS(mi);
7
8- if (class->send_about_to_show != NULL) {
9+ if (class != NULL && class->send_about_to_show != NULL) {
10 return class->send_about_to_show(mi, cb, cb_data);
11 } else if (cb != NULL) {
12 cb(mi, cb_data);

Subscribers

People subscribed via source and target branches