diff options
| author | Damon Chaplin <damon@ximian.com> | 2002-01-18 08:00:05 +0800 |
|---|---|---|
| committer | Damon Chaplin <damon@src.gnome.org> | 2002-01-18 08:00:05 +0800 |
| commit | 04e7d6891ca6b4c62b4d509a0f1194fdb06b82af (patch) | |
| tree | 7f4dd9640d050eb4fb0c5e3f392616c5dd83e110 /calendar | |
| parent | 7da35dfe09148edd34ae4b48a53b1eae179dc58c (diff) | |
| download | gsoc2013-evolution-04e7d6891ca6b4c62b4d509a0f1194fdb06b82af.tar gsoc2013-evolution-04e7d6891ca6b4c62b4d509a0f1194fdb06b82af.tar.gz gsoc2013-evolution-04e7d6891ca6b4c62b4d509a0f1194fdb06b82af.tar.bz2 gsoc2013-evolution-04e7d6891ca6b4c62b4d509a0f1194fdb06b82af.tar.lz gsoc2013-evolution-04e7d6891ca6b4c62b4d509a0f1194fdb06b82af.tar.xz gsoc2013-evolution-04e7d6891ca6b4c62b4d509a0f1194fdb06b82af.tar.zst gsoc2013-evolution-04e7d6891ca6b4c62b4d509a0f1194fdb06b82af.zip | |
save the alarm string in the correct variable (str), so it actually gets
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.
svn path=/trunk/; revision=15352
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 6 | ||||
| -rw-r--r-- | calendar/gui/dialogs/alarm-page.c | 3 |
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; } |