diff options
| -rw-r--r-- | calendar/ChangeLog | 34 | ||||
| -rw-r--r-- | calendar/gui/e-itip-control.c | 2 |
2 files changed, 21 insertions, 15 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 5b77fc1b59..a3fb87d38e 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,20 +1,26 @@ +2002-12-16 Jeffrey Stedfast <fejj@ximian.com> + + * gui/e-itip-control.c (write_html): Correctly convert text.value + into HTML here (ie, don't pass "<i>None</i>" into e_text_to_html() + if text.value is NULL). + 2002-12-06 Rodrigo Moya <rodrigo@ximian.com> Fixes #35003 - - * gui/misc.[ch] (get_uri_without_password): new function for - removing the password from the CalClient's uris. - - * gui/gnome-cal.c (client_cal_opened_cb): use the URI returned by - get_uri_without_password for messages. - (backend_error_cb): likewise. - (backend_died_cb): likewise. - (gnome_calendar_open): likewise. - (open_error, method_error, permission_error): likewise. - - * gui/e-tasks.c (e_tasks_open): hide the password from the URI - being displayed in messages. - (backend_error_cb): likewise. + + * gui/misc.[ch] (get_uri_without_password): new function for + removing the password from the CalClient's uris. + + * gui/gnome-cal.c (client_cal_opened_cb): use the URI returned by + get_uri_without_password for messages. + (backend_error_cb): likewise. + (backend_died_cb): likewise. + (gnome_calendar_open): likewise. + (open_error, method_error, permission_error): likewise. + + * gui/e-tasks.c (e_tasks_open): hide the password from the URI + being displayed in messages. + (backend_error_cb): likewise. 2002-12-06 Hans Petter Jansson <hpj@ximian.com> diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c index 168ed4359b..117cf4468e 100644 --- a/calendar/gui/e-itip-control.c +++ b/calendar/gui/e-itip-control.c @@ -799,7 +799,7 @@ write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title, /* Summary */ cal_component_get_summary (priv->comp, &text); - html = e_text_to_html (text.value ? text.value : _("<i>None</i>"), E_TEXT_TO_HTML_CONVERT_NL); + html = text.value ? e_text_to_html (text.value, E_TEXT_TO_HTML_CONVERT_NL) : _("<i>None</i>"); gtk_html_stream_printf (html_stream, "<b>%s</b><br>%s<br><br>", _("Summary:"), html); g_free (html); |