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

[Ted Gould]

Check to ensure the property isn't set to NULL

Patch from bug

[Ted Gould (ted)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/libdbusmenu-autolanding/17/
Executed test runs:
    FAILURE: http://s-jenkins.ubuntu-ci:8080/job/generic-cleanup-mbs/3632/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-trusty-amd64-autolanding/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-trusty-armhf-autolanding/2/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:464
http://jenkins.qa.ubuntu.com/job/libdbusmenu-ci/14/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-trusty-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-trusty-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libdbusmenu-ci/14/rebuild

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

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)]

FAILED: Continuous integration, rev:464
http://jenkins.qa.ubuntu.com/job/libdbusmenu-ci/18/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-trusty-amd64-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/libdbusmenu-trusty-armhf-ci/5/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/libdbusmenu-ci/18/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'libdbusmenu-gtk/parser.c'
--- libdbusmenu-gtk/parser.c	2013-11-03 02:46:23 +0000
+++ libdbusmenu-gtk/parser.c	2013-12-13 15:32:21 +0000
@@ -1313,8 +1313,12 @@
 
 	  if (item != NULL) {
         GtkWidget * menu = GTK_WIDGET (g_value_get_object (&prop_value));
-        parse_menu_structure_helper(menu, &recurse);
-        watch_submenu(item, menu);
+        /* Ensure the submenu isn't being set to NULL to remove it
+         * (ex. Geany does this) */
+        if (menu != NULL) {
+            parse_menu_structure_helper(menu, &recurse);
+            watch_submenu(item, menu);
+        }
       } else {
         /* Note: it would be really odd that we wouldn't have a cached
            item, but we should handle that appropriately. */