Merge lp:~cjwatson/indicator-datetime/careful-hide-appointments into lp:indicator-datetime/13.04

[Colin Watson]

Check for NULL appointments in hide_all_appointments.

To suppress the criticals reported in bug 1110398, check for NULL appointments in hide_all_appointments.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:203
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/32/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=raring,flavor=armhf/32/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=raring,flavor=i386/32/console
Coverity artifacts:
    http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/32//artifact/results/coverity/NO_COVERITY_DEFECTS.txt
    http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=raring,flavor=armhf/32//artifact/results/coverity/NO_COVERITY_DEFECTS.txt
    http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=raring,flavor=i386/32//artifact/results/coverity/NO_COVERITY_DEFECTS.txt

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/32//rebuild/?

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Seems reasonable. The rest of the code should probably be fixed to avoid adding so many NULLs unnecessarily, but this will do for now.

review: Approve

=== modified file 'src/datetime-service.c'
--- src/datetime-service.c	2013-01-17 21:17:40 +0000
+++ src/datetime-service.c	2013-01-30 13:20:30 +0000
@@ -394,8 +394,10 @@
 	int i;
 
 	for (i=0; i<MAX_APPOINTMENT_MENUITEMS; i++) {
-		dbusmenu_menuitem_property_set_bool(appointments[i], DBUSMENU_MENUITEM_PROP_ENABLED, FALSE);
-		dbusmenu_menuitem_property_set_bool(appointments[i], DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
+		if (appointments[i]) {
+			dbusmenu_menuitem_property_set_bool(appointments[i], DBUSMENU_MENUITEM_PROP_ENABLED, FALSE);
+			dbusmenu_menuitem_property_set_bool(appointments[i], DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
+		}
 	}
 }