diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/alarm-notify-dialog.c | 10 |
2 files changed, 10 insertions, 8 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 99f5d77e31..b342556cc3 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2004-11-08 Rodney Dawes <dobey@novell.com> + + * gui/alarm-notify/alarm-notify-dialog.c (write_html_heading): + Don't try to convert the results of timet_to_str_with_zone to UTF-8, + since the return value is already encoded in UTF-8 + + Fixes #47529 + 2004-11-04 Rodrigo Moya <rodrigo@novell.com> * gui/dialogs/event-page.glade: diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c index af31715ea9..a84e13f66b 100644 --- a/calendar/gui/alarm-notify/alarm-notify-dialog.c +++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c @@ -221,7 +221,6 @@ static void write_html_heading (GtkHTMLStream *stream, const char *message, ECalComponentVType vtype, time_t occur_start, time_t occur_end) { - char *buf; char *start, *end; char *bg_path = "file://" EVOLUTION_IMAGESDIR "/bcg.png"; gchar *image_path; @@ -236,13 +235,8 @@ write_html_heading (GtkHTMLStream *stream, const char *message, current_zone = config_data_get_timezone (); - buf = timet_to_str_with_zone (occur_start, current_zone); - start = g_locale_to_utf8 (buf, -1, NULL, NULL, NULL); - g_free (buf); - - buf = timet_to_str_with_zone (occur_end, current_zone); - end = g_locale_to_utf8 (buf, -1, NULL, NULL, NULL); - g_free (buf); + start = timet_to_str_with_zone (occur_start, current_zone); + end = timet_to_str_with_zone (occur_end, current_zone); /* Write the header */ |