cvs removed.

2003-09-17  Not Zed  <NotZed@Ximian.com>

         * folder-browser.c, folder-browser.h, folder-browser-ui.c
         folder-browser-ui.h, mail-callbacks.c, mail-callbacks.h
         mail-display.c, mail-display.h, mail-display-stream.c
         mail-display-stream.h, mail-format.c, mail-format.h
         mail-identify.c, mail-search.c, mail-search.h
         message-browser.c, message-browser.h, subscribe-dialog.c
         subscribe-dialog.h, mail-font-prefs.c, mail-font-prefs.h: cvs
         removed.

        * Makefile.am: Removed mail-font-prefs.[ch], hasn't been built for
        ages.

        * em-*.c: killed a bunch of printfs.

        * em-format-html-display.c (efhd_html_button_press_event): update
        for html object api chagnes.

        ** Merge in mail-refactor-2 branch.

svn path=/trunk/; revision=22602

1 files changed, 277 insertions, 0 deletions

diff --git a/mail/em-format-html-quote.c b/mail/em-format-html-quote.c
new file mode 100644
index 0000000000..4333251186
--- /dev/null
+++ b/mail/em-format-html-quote.c
@@ -0,0 +1,277 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  Authors: Jeffrey Stedfast <fejj@ximian.com>
+ *
+ *  Copyright 2003 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.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
+
+#include <camel/camel-stream.h>
+#include <camel/camel-mime-filter-tohtml.h>
+#include "em-format-html-quote.h"
+
+struct _EMFormatHTMLQuotePrivate {
+	char *credits;
+};
+
+static void efhq_format_clone (EMFormat *, CamelMedium *, EMFormat *);
+static void efhq_format_error (EMFormat *emf, CamelStream *stream, const char *txt);
+static void efhq_format_message (EMFormat *, CamelStream *, CamelMedium *);
+static void efhq_format_source (EMFormat *, CamelStream *, CamelMimePart *);
+static void efhq_format_attachment (EMFormat *, CamelStream *, CamelMimePart *, const char *, const EMFormatHandler *);
+
+static void efhq_builtin_init (EMFormatHTMLQuoteClass *efhc);
+
+static EMFormatHTMLClass *efhq_parent;
+
+static void
+efhq_init (GObject *o)
+{
+	EMFormatHTMLQuote *efhq = (EMFormatHTMLQuote *) o;
+	
+	efhq->priv = g_malloc0 (sizeof (*efhq->priv));
+	
+	/* we want to convert url's etc */
+	((EMFormatHTML *) efhq)->text_html_flags |= CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS | CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES;
+	/* we want simple header format */
+	((EMFormatHTML *) efhq)->simple_headers = TRUE;
+}
+
+static void
+efhq_finalise (GObject *o)
+{
+	EMFormatHTMLQuote *efhq = (EMFormatHTMLQuote *) o;
+	
+	g_free (efhq->priv->credits);
+	g_free (efhq->priv);
+	
+	((GObjectClass *) efhq_parent)->finalize (o);
+}
+
+static void
+efhq_base_init(EMFormatHTMLQuoteClass *efhqklass)
+{
+	efhq_builtin_init(efhqklass);
+}
+
+static void
+efhq_class_init (GObjectClass *klass)
+{
+	((EMFormatClass *) klass)->format_clone = efhq_format_clone;
+	((EMFormatClass *) klass)->format_error = efhq_format_error;
+	((EMFormatClass *) klass)->format_message = efhq_format_message;
+	((EMFormatClass *) klass)->format_source = efhq_format_source;
+	((EMFormatClass *) klass)->format_attachment = efhq_format_attachment;
+	
+	klass->finalize = efhq_finalise;
+}
+
+GType
+em_format_html_quote_get_type (void)
+{
+	static GType type = 0;
+	
+	if (type == 0) {
+		static const GTypeInfo info = {
+			sizeof (EMFormatHTMLQuoteClass),
+			(GBaseInitFunc)efhq_base_init, NULL,
+			(GClassInitFunc)efhq_class_init,
+			NULL, NULL,
+			sizeof (EMFormatHTMLQuote), 0,
+			(GInstanceInitFunc) efhq_init
+		};
+		
+		efhq_parent = g_type_class_ref (em_format_html_get_type ());
+		type = g_type_register_static (em_format_html_get_type (), "EMFormatHTMLQuote", &info, 0);
+	}
+	
+	return type;
+}
+
+EMFormatHTMLQuote *
+em_format_html_quote_new (void)
+{
+	return (EMFormatHTMLQuote *) g_object_new (em_format_html_quote_get_type (), NULL);
+}
+
+EMFormatHTMLQuote *
+em_format_html_quote_new_with_credits (const char *credits)
+{
+	EMFormatHTMLQuote *emfq;
+	
+	emfq = (EMFormatHTMLQuote *) g_object_new (em_format_html_quote_get_type (), NULL);
+	emfq->priv->credits = g_strdup (credits);
+	
+	return emfq;
+}
+
+static void
+efhq_format_clone (EMFormat *emf, CamelMedium *part, EMFormat *src)
+{
+	((EMFormatClass *) efhq_parent)->format_clone (emf, part, src);
+}
+
+static void
+efhq_format_error (EMFormat *emf, CamelStream *stream, const char *txt)
+{
+	/* FIXME: should we even bother writign error text for quoting? probably not... */
+	((EMFormatClass *) efhq_parent)->format_error (emf, stream, txt);
+}
+
+static void
+efhq_format_message (EMFormat *emf, CamelStream *stream, CamelMedium *part)
+{
+	EMFormatHTMLQuote *emfq = (EMFormatHTMLQuote *) emf;
+	
+	camel_stream_printf (stream, "%s<!--+GtkHTML:<DATA class=\"ClueFlow\" key=\"orig\" value=\"1\">-->\n"
+			     "<font color=\"#%06x\">\n"
+			     "<blockquote type=cite>\n",
+			     emfq->priv->credits ? emfq->priv->credits : "",
+			     emfq->formathtml.citation_colour);
+
+	if (!((EMFormatHTML *)emf)->hide_headers)
+		em_format_html_format_headers((EMFormatHTML *)emf, stream, part);
+
+	em_format_part(emf, stream, (CamelMimePart *)part);
+	
+	camel_stream_write_string (stream, "</blockquote></font><!--+GtkHTML:<DATA class=\"ClueFlow\" clear=\"orig\">-->");
+}
+
+static void
+efhq_format_source (EMFormat *emf, CamelStream *stream, CamelMimePart *part)
+{
+	/* FIXME: should we just format_message? */
+	((EMFormatClass *) efhq_parent)->format_source (emf, stream, part);
+}
+
+static void
+efhq_format_attachment (EMFormat *emf, CamelStream *stream, CamelMimePart *part, const char *mime_type, const EMFormatHandler *handle)
+{
+	;
+}
+
+#include <camel/camel-medium.h>
+#include <camel/camel-mime-part.h>
+#include <camel/camel-multipart.h>
+#include <camel/camel-url.h>
+
+static void
+efhq_multipart_related(EMFormat *emf, CamelStream *stream, CamelMimePart *part, const EMFormatHandler *info)
+{
+	CamelMultipart *mp = (CamelMultipart *)camel_medium_get_content_object((CamelMedium *)part);
+	CamelMimePart *body_part, *display_part = NULL;
+	CamelContentType *content_type;
+	const char *location, *start;
+	int i, nparts;
+	CamelURL *base_save = NULL;
+
+	if (!CAMEL_IS_MULTIPART(mp)) {
+		em_format_format_source(emf, stream, part);
+		return;
+	}
+
+	/* sigh, so much for oo code reuse ... */
+	/* FIXME: put in a function */
+	nparts = camel_multipart_get_number(mp);	
+	content_type = camel_mime_part_get_content_type(part);
+	start = header_content_type_param(content_type, "start");
+	if (start && strlen(start)>2) {
+		int len;
+		const char *cid;
+
+		/* strip <>'s */
+		len = strlen (start) - 2;
+		start++;
+		
+		for (i=0; i<nparts; i++) {
+			body_part = camel_multipart_get_part(mp, i);
+			cid = camel_mime_part_get_content_id(body_part);
+			
+			if (cid && !strncmp(cid, start, len) && strlen(cid) == len) {
+				display_part = body_part;
+				break;
+			}
+		}
+	} else {
+		display_part = camel_multipart_get_part(mp, 0);
+	}
+	
+	if (display_part == NULL) {
+		em_format_part_as(emf, stream, part, "multipart/mixed");
+		return;
+	}
+	
+	/* stack of present location and pending uri's */
+	location = camel_mime_part_get_content_location(part);
+	if (location) {
+		base_save = emf->base;
+		emf->base = camel_url_new(location, NULL);
+	}
+	em_format_push_level(emf);
+
+	em_format_part(emf, stream, display_part);
+	em_format_pull_level(emf);
+	
+	if (location) {
+		camel_url_free(emf->base);
+		emf->base = base_save;
+	}
+}
+
+static const char *type_remove_table[] = {
+	"image/gif",
+	"image/jpeg",
+	"image/png",
+	"image/x-png",
+	"image/tiff",
+	"image/x-bmp",
+	"image/bmp",
+	"image/x-cmu-raster",
+	"image/x-portable-anymap",
+	"image/x-portable-bitmap",
+	"image/x-portable-graymap",
+	"image/x-portable-pixmap",
+	"image/x-xpixmap",
+	"message/external-body",
+	"multipart/appledouble",
+	"multipart/signed",
+	
+	"image/jpg",
+	"image/pjpeg",
+};
+
+static EMFormatHandler type_builtin_table[] = {
+	{ "multipart/related", (EMFormatFunc)efhq_multipart_related },
+};
+
+static void
+efhq_builtin_init (EMFormatHTMLQuoteClass *efhc)
+{
+	int i;
+	
+	for (i = 0; i < sizeof (type_remove_table) / sizeof (type_remove_table[0]); i++)
+		em_format_class_remove_handler ((EMFormatClass *) efhc, type_remove_table[i]);
+
+	for (i=0;i<sizeof(type_builtin_table)/sizeof(type_builtin_table[0]);i++)
+		em_format_class_add_handler((EMFormatClass *)efhc, &type_builtin_table[i]);
+}