Merge lp:~charlesk/indicator-datetime/lp-1069177 into lp:indicator-datetime/13.04

[Charles Kerr]

Fix the bug by ensuring that the dbusmenuitems in our appointment menuitem array are hidden if they're not currently in use.

Fix the bug by ensuring that the dbusmenuitems in our appointment menuitem array are hidden if they're not currently in use.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:193
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=quantal,flavor=amd64/19/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=quantal,flavor=i386/19/console

review: Approve (continuous-integration)

[Tom Jaeger (thjaeger)]

By the same token, the hide_all_appointments call in month_changed_cb should probably be removed as well.

[Charles Kerr (charlesk)]

Good call.

[lp:~charlesk/indicator-datetime/lp-1069177]

194. By Charles Kerr on 2012-11-01

in month_changed_cb(), remove the call to hide_all_appointments() to avoid flicker, same idea as previous commit.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:194
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=quantal,flavor=amd64/21/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/./build=pbuilder,distribution=quantal,flavor=i386/21/console

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

Looks good, thanks!

review: Approve

=== modified file 'src/datetime-service.c'
--- src/datetime-service.c	2012-10-09 16:59:12 +0000
+++ src/datetime-service.c	2012-11-01 08:52:21 +0000
@@ -399,8 +399,10 @@
 {
 	int i;
 
-	for (i=0; i<MAX_APPOINTMENT_MENUITEMS; 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);
+	}
 }
 
 static gboolean
@@ -415,8 +417,6 @@
 	   user. */
 	dbusmenu_menuitem_property_remove(menuitem, CALENDAR_MENUITEM_PROP_MARKS);
 
-	hide_all_appointments ();
-
 	g_idle_add(update_appointment_menu_items_idle, NULL);
 	return TRUE;
 }
@@ -446,8 +446,6 @@
 		}
 	}
 
-	hide_all_appointments ();
-
 	start_time_appointments = new_time;
 
 	g_debug("Received day-selected with timestamp: %d -> %s",(int)start_time_appointments, ctime(&start_time_appointments));