From b6a4a8bdb86886c8715f487f35069a5c90c72b9c Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 16 Dec 2002 14:55:28 +0000 Subject: Correctly convert text.value into HTML here (ie, don't pass "None" 2002-12-16 Jeffrey Stedfast * gui/e-itip-control.c (write_html): Correctly convert text.value into HTML here (ie, don't pass "None" into e_text_to_html() if text.value is NULL). svn path=/trunk/; revision=19123 --- calendar/ChangeLog | 34 ++++++++++++++++++++-------------- calendar/gui/e-itip-control.c | 2 +- 2 files changed, 21 insertions(+), 15 deletions(-) (limited to 'calendar') 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 + + * gui/e-itip-control.c (write_html): Correctly convert text.value + into HTML here (ie, don't pass "None" into e_text_to_html() + if text.value is NULL). + 2002-12-06 Rodrigo Moya 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 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 : _("None"), E_TEXT_TO_HTML_CONVERT_NL); + html = text.value ? e_text_to_html (text.value, E_TEXT_TO_HTML_CONVERT_NL) : _("None"); gtk_html_stream_printf (html_stream, "%s
%s

", _("Summary:"), html); g_free (html); -- cgit v1.2.3