aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/dialogs/alarm-page.c3
2 files changed, 7 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 280990c482..caa3696be7 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-17 Damon Chaplin <damon@ximian.com>
+
+ * gui/dialogs/alarm-page.c (get_alarm_string): save the alarm string
+ in the correct variable (str), so it actually gets shown for alarms
+ with specific trigger times. Fixes bug #18801.
+
2002-01-15 Rodrigo Moya <rodrigo@ximian.com>
* gui/dialogs/task-page.c (task_page_fill_widgets): default component
diff --git a/calendar/gui/dialogs/alarm-page.c b/calendar/gui/dialogs/alarm-page.c
index cbc23837da..c06e975ed7 100644
--- a/calendar/gui/dialogs/alarm-page.c
+++ b/calendar/gui/dialogs/alarm-page.c
@@ -435,7 +435,6 @@ get_alarm_string (CalComponentAlarm *alarm)
char *location;
struct tm tm;
char buf[256];
- char *date;
/* Absolute triggers come in UTC, so convert them to the local timezone */
@@ -450,7 +449,7 @@ get_alarm_string (CalComponentAlarm *alarm)
e_time_format_date_and_time (&tm, calendar_config_get_24_hour_format (),
FALSE, FALSE, buf, sizeof (buf));
- date = g_strdup_printf (_("%s at %s"), base, buf);
+ str = g_strdup_printf (_("%s at %s"), base, buf);
break; }