Merge lp:~ted/libdbusmenu/lp907635 into lp:libdbusmenu/14.04

Proposed by Ted Gould on 2013-12-13
Status: Merged
Approved by: Ted Gould on 2013-12-19
Approved revision: 464
Merged at revision: 464
Proposed branch: lp:~ted/libdbusmenu/lp907635
Merge into: lp:libdbusmenu/14.04
Diff against target: 18 lines (+6/-2)
1 file modified
libdbusmenu-gtk/parser.c (+6/-2)
To merge this branch: bzr merge lp:~ted/libdbusmenu/lp907635
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2013-12-19
Ted Gould (community) Approve on 2013-12-13
Review via email: mp+198961@code.launchpad.net

Commit message

Check to ensure the property isn't set to NULL

Description of the change

Patch from bug

To post a comment you must log in.
Ted Gould (ted) :
review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Sebastien Bacher (seb128) wrote :

the build issue is due to invalid g_source_remove() use, the new glib is reporting those. I've opened https://bugs.launchpad.net/ubuntu/+source/libdbusmenu/+bug/1260779 about the issue

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libdbusmenu-gtk/parser.c'
2--- libdbusmenu-gtk/parser.c 2013-11-03 02:46:23 +0000
3+++ libdbusmenu-gtk/parser.c 2013-12-13 15:32:21 +0000
4@@ -1313,8 +1313,12 @@
5
6 if (item != NULL) {
7 GtkWidget * menu = GTK_WIDGET (g_value_get_object (&prop_value));
8- parse_menu_structure_helper(menu, &recurse);
9- watch_submenu(item, menu);
10+ /* Ensure the submenu isn't being set to NULL to remove it
11+ * (ex. Geany does this) */
12+ if (menu != NULL) {
13+ parse_menu_structure_helper(menu, &recurse);
14+ watch_submenu(item, menu);
15+ }
16 } else {
17 /* Note: it would be really odd that we wouldn't have a cached
18 item, but we should handle that appropriately. */

Subscribers

People subscribed via source and target branches

to all changes: