From 657415f900996ed50786c5a48ca5d53d2e571fb1 Mon Sep 17 00:00:00 2001 From: Hiroyuki Ikezoe Date: Fri, 3 Aug 2007 12:01:54 +0000 Subject: ** Fix for bug #377173 2007-08-03 Hiroyuki Ikezoe ** Fix for bug #377173 * gui/e-cal-component-memo-preview.c: * gui/e-cal-component-preview.c: Show category icon correctly. svn path=/trunk/; revision=33944 --- calendar/ChangeLog | 7 +++++++ calendar/gui/e-cal-component-memo-preview.c | 6 +++++- calendar/gui/e-cal-component-preview.c | 3 +++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 946b2eed06..573dcb979d 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,10 @@ +2007-08-03 Hiroyuki Ikezoe + + ** Fix for bug #377173 + + * gui/e-cal-component-memo-preview.c: + * gui/e-cal-component-preview.c: Show category icon correctly. + 2007-08-02 Milan Crha ** Fix for bug #322624 diff --git a/calendar/gui/e-cal-component-memo-preview.c b/calendar/gui/e-cal-component-memo-preview.c index 4608967cfd..aeeb30ec79 100644 --- a/calendar/gui/e-cal-component-memo-preview.c +++ b/calendar/gui/e-cal-component-memo-preview.c @@ -98,6 +98,9 @@ url_requested_cb (GtkHTML *html, const char *url, GtkHTMLStream *stream, gpointe } while (result == GNOME_VFS_OK); gnome_vfs_close (handle); + + if (result == GNOME_VFS_ERROR_EOF) + gtk_html_stream_close (stream, GTK_HTML_STREAM_OK); } } } @@ -187,7 +190,8 @@ write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone } } - gtk_html_stream_printf(stream, "%s", string->str); + if (string->len > 0) + gtk_html_stream_printf(stream, "%s", string->str); g_string_free (string, TRUE); diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c index b833ef06ad..94092893ca 100644 --- a/calendar/gui/e-cal-component-preview.c +++ b/calendar/gui/e-cal-component-preview.c @@ -96,6 +96,9 @@ url_requested_cb (GtkHTML *html, const char *url, GtkHTMLStream *stream, gpointe } while (result == GNOME_VFS_OK); gnome_vfs_close (handle); + + if (result == GNOME_VFS_ERROR_EOF) + gtk_html_stream_close (stream, GTK_HTML_STREAM_OK); } } } -- cgit v1.2.3