MERGE NEW_PARSER branch into HEAD, fixed conflicts.

2000-04-20  NotZed  <NotZed@HelixCode.com>

	* MERGE NEW_PARSER branch into HEAD, fixed conflicts.

	* gmime-content-field.c (_print_parameter): Duh, removed again
	(@@#$@ cvs merge).

	* camel-mime-utils.c (header_content_type_is): Constify.
	(header_content_type_unref): Killed a couple warnings.

	* camel-folder.c (_init): Removed more log crap.

	* providers/Makefile.am (SUBDIRS): Removed nntp, pending fixes for
	summary changes.

	* providers/mbox/camel-mbox-folder.c (_get_message_by_number):
	Fixed for new summary interface.  Added a warning for using this
	broken api.
	(_get_message_by_uid): Fixed for message new with session
	vanishing.

svn path=/trunk/; revision=2531

1 files changed, 243 insertions, 0 deletions

diff --git a/camel/camel-mime-filter-charset.c b/camel/camel-mime-filter-charset.c
new file mode 100644
index 0000000000..eb9db60802
--- /dev/null
+++ b/camel/camel-mime-filter-charset.c
@@ -0,0 +1,243 @@
+/*
+ *  Copyright (C) 2000 Helix Code Inc.
+ *
+ *  Authors: Michael Zucchi <notzed@helixcode.com>
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library 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 Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public
+ *  License along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+#include <unicode.h>
+
+#include <string.h>
+#include <errno.h>
+
+#include "camel-mime-filter-charset.h"
+
+
+static void camel_mime_filter_charset_class_init (CamelMimeFilterCharsetClass *klass);
+static void camel_mime_filter_charset_init       (CamelMimeFilterCharset *obj);
+
+static CamelMimeFilterClass *camel_mime_filter_charset_parent;
+
+enum SIGNALS {
+	LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
+
+guint
+camel_mime_filter_charset_get_type (void)
+{
+	static guint type = 0;
+	
+	if (!type) {
+		GtkTypeInfo type_info = {
+			"CamelMimeFilterCharset",
+			sizeof (CamelMimeFilterCharset),
+			sizeof (CamelMimeFilterCharsetClass),
+			(GtkClassInitFunc) camel_mime_filter_charset_class_init,
+			(GtkObjectInitFunc) camel_mime_filter_charset_init,
+			(GtkArgSetFunc) NULL,
+			(GtkArgGetFunc) NULL
+		};
+		
+		type = gtk_type_unique (camel_mime_filter_get_type (), &type_info);
+	}
+	
+	return type;
+}
+
+static void
+finalise(GtkObject *o)
+{
+	CamelMimeFilterCharset *f = (CamelMimeFilterCharset *)o;
+
+	g_free(f->from);
+	g_free(f->to);
+	if (f->ic != (unicode_iconv_t)-1) {
+		unicode_iconv_close(f->ic);
+		f->ic = (unicode_iconv_t) -1;
+	}
+
+	((GtkObjectClass *)camel_mime_filter_charset_parent)->finalize (o);
+}
+
+static void
+reset(CamelMimeFilter *mf)
+{
+	CamelMimeFilterCharset *f = (CamelMimeFilterCharset *)mf;
+	char buf[16];
+	char *buffer;
+	int outlen = 16;
+
+	/* what happens with the output bytes if this resets the state? */
+	if (f->ic != (unicode_iconv_t) -1) {
+		buffer = buf;
+		unicode_iconv(f->ic, NULL, 0, &buffer, &outlen);
+	}
+}
+
+static void
+complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlenptr, size_t *outprespace)
+{
+	CamelMimeFilterCharset *f = (CamelMimeFilterCharset *)mf;
+	int converted;
+	char *inbuf, *outbuf;
+	int inlen, outlen;
+
+	if (f->ic == (unicode_iconv_t) -1) {
+		goto donothing;
+	}
+
+	/* FIXME: there's probably a safer way to size this ...? */
+	/* We could always resize if we run out of room in outbuf (but it'd be nice not
+	   to have to) */
+	camel_mime_filter_set_size(mf, len*5, FALSE);
+	inbuf = in;
+	inlen = len;
+	outbuf = mf->outbuf;
+	outlen = mf->outsize;
+	if (inlen>0) {
+		converted = unicode_iconv(f->ic, &inbuf, &inlen, &outbuf, &outlen);
+		if (converted == -1) {
+			if (errno != EINVAL) {
+				g_warning("error occured converting: %s", strerror(errno));
+				goto donothing;
+			}
+		}
+
+		if (inlen>0) {
+			g_warning("Output lost in character conversion, invalid sequence encountered?");
+		}
+	}
+
+	/* this 'resets' the output stream, returning back to the initial
+	   shift state for multishift charactersets */
+	converted = unicode_iconv(f->ic, NULL, 0, &outbuf, &outlen);
+	if (converted == -1) {
+		g_warning("Conversion failed to complete: %s", strerror(errno));
+	}
+
+	*out = mf->outbuf;
+	*outlenptr = mf->outsize - outlen;
+	*outprespace = mf->outpre;
+	return;
+
+donothing:
+	*out = in;
+	*outlenptr = len;
+	*outprespace = prespace;
+}
+
+static void
+filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlenptr, size_t *outprespace)
+{
+	CamelMimeFilterCharset *f = (CamelMimeFilterCharset *)mf;
+	int converted;
+	char *inbuf, *outbuf;
+	int inlen, outlen;
+
+	if (f->ic == (unicode_iconv_t) -1) {
+		goto donothing;
+	}
+
+	/* FIXME: there's probably a safer way to size this ...? */
+	camel_mime_filter_set_size(mf, len*5, FALSE);
+	inbuf = in;
+	inlen = len;
+	outbuf = mf->outbuf;
+	outlen = mf->outsize;
+	converted = unicode_iconv(f->ic, &inbuf, &inlen, &outbuf, &outlen);
+	if (converted == -1) {
+		if (errno != EINVAL) {
+			g_warning("error occured converting: %s", strerror(errno));
+			goto donothing;
+		}
+	}
+
+	/*
+	  NOTE: This assumes EINVAL only occurs because we ran out of
+	  bytes for a multibyte sequence, if not, we're in trouble.
+	*/
+
+	if (inlen>0) {
+		camel_mime_filter_backup(mf, inbuf, inlen);
+	}
+
+	*out = mf->outbuf;
+	*outlenptr = mf->outsize - outlen;
+	*outprespace = mf->outpre;
+	return;
+
+donothing:
+	*out = in;
+	*outlenptr = len;
+	*outprespace = prespace;
+}
+
+static void
+camel_mime_filter_charset_class_init (CamelMimeFilterCharsetClass *klass)
+{
+	GtkObjectClass *object_class = (GtkObjectClass *) klass;
+	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;
+	
+	camel_mime_filter_charset_parent = gtk_type_class (camel_mime_filter_get_type ());
+
+	object_class->finalize = finalise;
+
+	filter_class->reset = reset;
+	filter_class->filter = filter;
+	filter_class->complete = complete;
+
+	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
+}
+
+static void
+camel_mime_filter_charset_init (CamelMimeFilterCharset *obj)
+{
+	obj->ic = (unicode_iconv_t)-1;
+}
+
+/**
+ * camel_mime_filter_charset_new:
+ *
+ * Create a new CamelMimeFilterCharset object.
+ * 
+ * Return value: A new CamelMimeFilterCharset widget.
+ **/
+CamelMimeFilterCharset *
+camel_mime_filter_charset_new (void)
+{
+	CamelMimeFilterCharset *new = CAMEL_MIME_FILTER_CHARSET ( gtk_type_new (camel_mime_filter_charset_get_type ()));
+	return new;
+}
+
+CamelMimeFilterCharset *
+camel_mime_filter_charset_new_convert(const char *from_charset, const char *to_charset)
+{
+	CamelMimeFilterCharset *new = CAMEL_MIME_FILTER_CHARSET ( gtk_type_new (camel_mime_filter_charset_get_type ()));
+
+	new->ic = unicode_iconv_open(to_charset, from_charset);
+	if (new->ic == (unicode_iconv_t) -1) {
+		g_warning("Cannot create charset conversion from %s to %s: %s", from_charset, to_charset, strerror(errno));
+		gtk_object_unref((GtkObject *)new);
+		new = NULL;
+	} else {
+		new->from = g_strdup(from_charset);
+		new->to = g_strdup(to_charset);
+	}
+	return new;
+}