aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorHarish Krishnaswamy <kharish@novell.com>2006-05-04 17:35:24 +0800
committerHarish Krishnaswamy <kharish@src.gnome.org>2006-05-04 17:35:24 +0800
commit898e686c834493fb8b2da58b967af220ad530f49 (patch)
tree030929cb8622a9e9deccd87d0ce58b7508d33033 /calendar
parent3b5e5c0787e3220391cb7b8eba5d4e4a41156f7d (diff)
downloadgsoc2013-evolution-898e686c834493fb8b2da58b967af220ad530f49.tar.gz
gsoc2013-evolution-898e686c834493fb8b2da58b967af220ad530f49.tar.zst
gsoc2013-evolution-898e686c834493fb8b2da58b967af220ad530f49.zip
Upstreaming Chen's patch. Fixes #333689
2006-05-04 Harish Krishnaswamy <kharish@novell.com> Upstreaming Chen's patch. Fixes #333689 svn path=/trunk/; revision=31952
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog7
-rw-r--r--calendar/gui/dialogs/event-page.c6
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 <pchenthill novell com>
+
+ 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 <pchenthill@novell.com>
Committing change pointed by Li Yuan <Li.Yuan@Sun.COM>
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;