diff options
-rw-r--r-- | mail/ChangeLog | 11 | ||||
-rw-r--r-- | mail/em-html-stream.c | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 78490a4f8d..521efd7bae 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2003-12-05 Radek Doulik <rodo@ximian.com> + + * em-html-stream.c (emhs_sync_flush): use new gtk_html_flush + method instead of forcing processing of all gtk events + 2003-12-04 Jeffrey Stedfast <fejj@ximian.com> * em-folder-tree-model.c (em_folder_tree_model_remove_folders): @@ -22,6 +27,12 @@ 2003-12-04 Radek Doulik <rodo@ximian.com> + * em-junk-filter.c (pipe_to_sa): add new err_retval parameter, + which specifies which value to return if something went wrong + (like failed to exec, ...). update all calls by that. actual junk + check has err_retval = 0 to avoid marking false spam - non-zero + retval means junk. + * em-folder-view.c: set junk toolbar buttons pixmaps * mail-session.c: monitor gconf key diff --git a/mail/em-html-stream.c b/mail/em-html-stream.c index f55365d7c7..955525c306 100644 --- a/mail/em-html-stream.c +++ b/mail/em-html-stream.c @@ -124,9 +124,7 @@ emhs_sync_flush(CamelStream *stream) if (emhs->html_stream == NULL) return -1; - /* FIXME: flush html stream via gtkhtml_stream_flush which doens't exist yet ... */ - while (gtk_events_pending ()) - gtk_main_iteration (); + gtk_html_flush (emhs->html); return 0; } |