aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2012-10-09 19:35:07 +0200
committerSebastien Bacher <seb128@ubuntu.com>2012-10-09 19:35:07 +0200
commit324a0a5f7490e774bcb6d015c39a341da08f6945 (patch)
tree248891d1ecc19a73c1cc5f446cd960dd2c46ac27
parentf7ba1888e002430df29a759dfcc7e0679234b0a5 (diff)
parent5c9f6467b9a8573439d1bee52a358678b10e5805 (diff)
downloadayatana-indicator-datetime-324a0a5f7490e774bcb6d015c39a341da08f6945.tar.gz
ayatana-indicator-datetime-324a0a5f7490e774bcb6d015c39a341da08f6945.tar.bz2
ayatana-indicator-datetime-324a0a5f7490e774bcb6d015c39a341da08f6945.zip
Backport "fix off-by-one error" leading to have the settings item run
the calendar application rather than the control center (lp: #1064375)
-rw-r--r--debian/changelog7
-rw-r--r--src/datetime-service.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 60462c1..24ad8ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-datetime (12.10.2-0ubuntu3) UNRELEASED; urgency=low
+
+ * Backport "fix off-by-one error" leading to have the settings item run
+ the calendar application rather than the control center (lp: #1064375)
+
+ -- Sebastien Bacher <seb128@ubuntu.com> Tue, 09 Oct 2012 19:32:20 +0200
+
indicator-datetime (12.10.2-0ubuntu2) quantal; urgency=low
* Backport fix from Lars for a missing NULL check leading to segfault
diff --git a/src/datetime-service.c b/src/datetime-service.c
index f0c45c0..b34c23e 100644
--- a/src/datetime-service.c
+++ b/src/datetime-service.c
@@ -833,8 +833,8 @@ update_appointment_menu_items (gpointer unused)
if (i >= MAX_APPOINTMENT_MENUITEMS)
continue;
- i++;
item = appointments[i];
+ i++;
/* Remove the icon as we might not replace it on error */
dbusmenu_menuitem_property_remove(item, APPOINTMENT_MENUITEM_PROP_ICON);