Merge lp:~ted/indicator-appmenu/lp930059 into lp:indicator-appmenu/0.4

[Ted Gould]

Make sure the properties exist before making decisions based on them.

[Conor Curran (cjcurran)]

review: Approve

=== modified file 'src/menuitem-collector.c'
--- src/menuitem-collector.c	2012-02-03 22:01:35 +0000
+++ src/menuitem-collector.c	2012-02-10 20:37:20 +0000
@@ -278,6 +278,7 @@
 	{type: "appointment-item",                             label: "appointment-label",                                  visible: DBUSMENU_MENUITEM_PROP_VISIBLE,    enabled: DBUSMENU_MENUITEM_PROP_ENABLED},
 	{type: "timezone-item",                                label: "timezone-name",                                      visible: DBUSMENU_MENUITEM_PROP_VISIBLE,    enabled: DBUSMENU_MENUITEM_PROP_ENABLED},
 	/* Indicator Sound */
+	/* x-canonical-sound-menu-player-transport-type */
 	{type: "x-canonical-sound-menu-player-metadata-type",  label: "x-canonical-sound-menu-player-metadata-player-name", visible: DBUSMENU_MENUITEM_PROP_VISIBLE,    enabled: DBUSMENU_MENUITEM_PROP_ENABLED},
 	{type: "x-canonical-sound-menu-mute-type",             label: "label",                                              visible: DBUSMENU_MENUITEM_PROP_VISIBLE,    enabled: DBUSMENU_MENUITEM_PROP_ENABLED},
 	/* Indicator User */
@@ -371,11 +372,13 @@
 		/* Skip the items that are disabled or not visible as they wouldn't
 		   be usable in the application so we don't want to show them and
 		   act like they're usable in the HUD either */
-		if (!dbusmenu_menuitem_property_get_bool(rootitem, prop_strings->enabled)) {
+		if (dbusmenu_menuitem_property_exist(rootitem, prop_strings->enabled) &&
+				!dbusmenu_menuitem_property_get_bool(rootitem, prop_strings->enabled)) {
 			return results;
 		}
 
-		if (!dbusmenu_menuitem_property_get_bool(rootitem, prop_strings->visible)) {
+		if (dbusmenu_menuitem_property_exist(rootitem, prop_strings->visible) &&
+				!dbusmenu_menuitem_property_get_bool(rootitem, prop_strings->visible)) {
 			return results;
 		}
 	}