diff options
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/gui/calendar-model.c | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index d261d43b97..d33bfd24e7 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2001-11-14 Federico Mena Quintero <federico@ximian.com> + + * gui/calendar-model.c (date_value_to_string): Convert the buffer + to UTF8. + (calendar_model_value_to_string): Do not convert the string fields + to UTF8 again; they are already in UTF8. Fixes the UTF8-related + bits of bug #15304. + 2001-11-14 Damon Chaplin <damon@ximian.com> * gui/calendar-model.c: diff --git a/calendar/gui/calendar-model.c b/calendar/gui/calendar-model.c index b9a5d41261..e0e4f97d7e 100644 --- a/calendar/gui/calendar-model.c +++ b/calendar/gui/calendar-model.c @@ -1680,7 +1680,7 @@ date_value_to_string (ETableModel *etm, const void *value) e_time_format_date_and_time (&tmp_tm, priv->use_24_hour_format, TRUE, FALSE, buffer, sizeof (buffer)); - return g_strdup (buffer); + return e_utf8_from_locale_string (buffer); } @@ -1698,7 +1698,7 @@ calendar_model_value_to_string (ETableModel *etm, int col, const void *value) case CAL_COMPONENT_FIELD_TRANSPARENCY: case CAL_COMPONENT_FIELD_URL: case CAL_COMPONENT_FIELD_STATUS: - return e_utf8_from_locale_string (value); + return g_strdup (value); case CAL_COMPONENT_FIELD_COMPLETED: case CAL_COMPONENT_FIELD_DTEND: |