From 898e686c834493fb8b2da58b967af220ad530f49 Mon Sep 17 00:00:00 2001 From: Harish Krishnaswamy Date: Thu, 4 May 2006 09:35:24 +0000 Subject: Upstreaming Chen's patch. Fixes #333689 2006-05-04 Harish Krishnaswamy Upstreaming Chen's patch. Fixes #333689 svn path=/trunk/; revision=31952 --- calendar/ChangeLog | 7 +++++++ calendar/gui/dialogs/event-page.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 4220b48ac5..f55ce1682e 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2006-05-04 Chenthill Palanisamy + + Fixes #333689 + * gui/dialogs/event-page.c + (init_widgets): Check if the units is -1 before + adding the menu item. + 2006-05-02 Chenthill Palanisamy Committing change pointed by Li Yuan diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index b617be9550..4cb6d5e3b3 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -2920,7 +2920,7 @@ init_widgets (EventPage *epage) switch (priv->alarm_units) { case CAL_DAYS: - if (priv->alarm_interval != 1) { + if (priv->alarm_interval != -1) { menu_label = g_strdup_printf (ngettext("%d day before appointment", "%d days before appointment", priv->alarm_interval), priv->alarm_interval); } else { priv->alarm_interval = -1; @@ -2928,7 +2928,7 @@ init_widgets (EventPage *epage) break; case CAL_HOURS: - if (priv->alarm_interval != 1) { + if (priv->alarm_interval != -1) { menu_label = g_strdup_printf (ngettext("%d hour before appointment", "%d hours before appointment", priv->alarm_interval), priv->alarm_interval); } else { priv->alarm_interval = -1; @@ -2936,7 +2936,7 @@ init_widgets (EventPage *epage) break; case CAL_MINUTES: - if (priv->alarm_interval != 15) { + if (priv->alarm_interval != -1) { menu_label = g_strdup_printf (ngettext("%d minute before appointement", "%d minutes before appointment", priv->alarm_interval), priv->alarm_interval); } else { priv->alarm_interval = -1; -- cgit v1.2.3