Merge lp:~charlesk/indicator-datetime/lp-1064375 into lp:indicator-datetime/12.10

[Charles Kerr]

fix off-by-one error in the appointments dbusmenuitem array

[jenkins (martin-mrazik+qa)]

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

review: Approve (continuous-integration)

[Lars Karlitski (larsu)]

This solution looks like it will be a problem the next time someone uses `i` further down in that loop. I prefer moving `i++` down to the very end of the loop or putting the looping logic inside the for statement:

  for (l = sorted_comp_instances, i = 0; l; l = l->next, i++) {
    /* ... */
  }

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

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

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

We can't put the increment in the loop logic because there are several "continue;" cases before that line is reached where we don't want to increment the index variable.

We could move the increment to the end of the loop, but since these are the only two lines that refer to i, does it really make sense to put 120 lines of code between them?

[Lars Karlitski (larsu)]

review: Approve

=== modified file 'src/datetime-service.c'
--- src/datetime-service.c	2012-10-05 13:26:16 +0000
+++ src/datetime-service.c	2012-10-09 17:08:40 +0000
@@ -833,8 +833,8 @@
 		if (i >= MAX_APPOINTMENT_MENUITEMS)
 			continue;
 
+		item = appointments[i];
 		i++;
-		item = appointments[i];
 
 		/* Remove the icon as we might not replace it on error */
 		dbusmenu_menuitem_property_remove(item, APPOINTMENT_MENUITEM_PROP_ICON);