From 2f1a1a22feb83e27635bb25658ae6b4103285878 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 16 Dec 2002 16:47:51 +0000 Subject: Re-implemented to use streams. Also no need to check for html since 2002-12-16 Jeffrey Stedfast * mail-format.c (handle_text_plain): Re-implemented to use streams. Also no need to check for html since camel-mime-part-utils.c now does this for us and will re-tag the mime-type as text/html thus the UI can be completely ignorant of this process. (handle_text_plain_flowed): Removed. (write_one_text_plain_chunk): Removed. (try_uudecoding): Removed. (try_inline_binhex): Removed. (handle_text_enriched): Re-implemented to use streams too. 2002-12-15 Jeffrey Stedfast * mail-format.c (write_text_header): Change the order of the args to be consistant with other write functions. (write_date): Same. (write_field_row_begin): Here too. (write_headers): Here too. (write_one_text_plain_chunk): Don't strdup just to pass it to mail_text_write() so that it can dup it yet again into html text and dup it yet a 3rd time into a GByteArray. Instead just write it to gtkhtml. (handle_*): Fixed arguments to take a MailDisplayStream instead of a GtkHTML widget and a GtkHMLStream. * mail-display.c (mail_display_render): Create a MailDisplayStream to pass to mail_format_mime_message() and mail_format_raw_message(). * mail-display-stream.[c,h]: New stream to replace mail-stream-gtkhtml.c * mail-stream-gtkhtml.[c,h]: Removed. svn path=/trunk/; revision=19126 --- mail/mail-display.h | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) (limited to 'mail/mail-display.h') diff --git a/mail/mail-display.h b/mail/mail-display.h index 4bb9a3a017..c9fefb7e6a 100644 --- a/mail/mail-display.h +++ b/mail/mail-display.h @@ -1,4 +1,25 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* + * Authors: Jeffrey Stedfast + * + * Copyright 2002 Ximian, Inc. (www.ximian.com) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. + * + */ + #ifndef _MAIL_DISPLAY_H_ #define _MAIL_DISPLAY_H_ @@ -16,6 +37,7 @@ #include "mail-types.h" #include "mail-config.h" /*display_style*/ +#include "mail-display-stream.h" #define MAIL_DISPLAY_TYPE (mail_display_get_type ()) #define MAIL_DISPLAY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MAIL_DISPLAY_TYPE, MailDisplay)) @@ -95,18 +117,13 @@ void mail_display_set_charset (MailDisplay *mail_display, void mail_display_load_images (MailDisplay *mail_display); - -#define mail_html_write(html, stream, string) gtk_html_write (html, stream, string, strlen (string)) - -void mail_text_write (GtkHTML *html, - GtkHTMLStream *stream, +void mail_text_write (MailDisplayStream *stream, MailDisplay *md, CamelMimePart *part, gint idx, gboolean printing, const char *text); -void mail_error_printf (GtkHTML *html, - GtkHTMLStream *stream, +void mail_error_printf (MailDisplayStream *stream, const char *format, ...); char *mail_display_add_url (MailDisplay *md, const char *kind, char *url, gpointer data); -- cgit v1.2.3