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, 166 insertions, 0 deletions

diff --git a/camel/camel-mime-filter-index.c b/camel/camel-mime-filter-index.c
new file mode 100644
index 0000000000..24c223d4e5
--- /dev/null
+++ b/camel/camel-mime-filter-index.c
@@ -0,0 +1,166 @@
+/*
+ *  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 "camel-mime-filter-index.h"
+
+
+static void camel_mime_filter_index_class_init (CamelMimeFilterIndexClass *klass);
+static void camel_mime_filter_index_init       (CamelMimeFilterIndex *obj);
+
+static CamelMimeFilterClass *camel_mime_filter_index_parent;
+
+enum SIGNALS {
+	LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
+
+guint
+camel_mime_filter_index_get_type (void)
+{
+	static guint type = 0;
+	
+	if (!type) {
+		GtkTypeInfo type_info = {
+			"CamelMimeFilterIndex",
+			sizeof (CamelMimeFilterIndex),
+			sizeof (CamelMimeFilterIndexClass),
+			(GtkClassInitFunc) camel_mime_filter_index_class_init,
+			(GtkObjectInitFunc) camel_mime_filter_index_init,
+			(GtkArgSetFunc) NULL,
+			(GtkArgGetFunc) NULL
+		};
+		
+		type = gtk_type_unique (camel_mime_filter_get_type (), &type_info);
+	}
+	
+	return type;
+}
+
+static void
+finalise(GtkObject *o)
+{
+	CamelMimeFilterIndex *f = (CamelMimeFilterIndex *)o;
+
+	g_free(f->name);
+	f->index = NULL;	/* ibex's need refcounting? */
+
+	((GtkObjectClass *)camel_mime_filter_index_parent)->finalize (o);
+}
+
+static void
+complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlenptr, size_t *outprespace)
+{
+	CamelMimeFilterIndex *f = (CamelMimeFilterIndex *)mf;
+
+	if (f->index == NULL || f->name==NULL) {
+		goto donothing;
+	}
+
+	ibex_index_buffer(f->index, f->name, in, len, NULL);
+
+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)
+{
+	CamelMimeFilterIndex *f = (CamelMimeFilterIndex *)mf;
+	int inleft = 0;
+
+	if (f->index == NULL || f->name==NULL) {
+		goto donothing;
+	}
+
+	ibex_index_buffer(f->index, f->name, in, len, &inleft);
+
+	if (inleft>0) {
+		camel_mime_filter_backup(mf, in+(len-inleft), inleft);
+	}
+
+	*out = in;
+	*outlenptr = len-inleft;
+	*outprespace = prespace;
+	return;
+
+donothing:
+	*out = in;
+	*outlenptr = len;
+	*outprespace = prespace;
+}
+
+static void
+camel_mime_filter_index_class_init (CamelMimeFilterIndexClass *klass)
+{
+	GtkObjectClass *object_class = (GtkObjectClass *) klass;
+	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;
+	
+	camel_mime_filter_index_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_index_init (CamelMimeFilterIndex *obj)
+{
+}
+
+/**
+ * camel_mime_filter_index_new:
+ *
+ * Create a new CamelMimeFilterIndex object.
+ * 
+ * Return value: A new CamelMimeFilterIndex widget.
+ **/
+CamelMimeFilterIndex *
+camel_mime_filter_index_new (void)
+{
+	CamelMimeFilterIndex *new = CAMEL_MIME_FILTER_INDEX ( gtk_type_new (camel_mime_filter_index_get_type ()));
+	return new;
+}
+
+CamelMimeFilterIndex      *camel_mime_filter_index_new_ibex (ibex *index)
+{
+	CamelMimeFilterIndex *new = camel_mime_filter_index_new();
+
+	if (new) {
+		new->index = index;
+		new->name = g_strdup("");
+	}
+	return new;
+}
+
+/* Set the match name for any indexed words */
+void camel_mime_filter_index_set_name (CamelMimeFilterIndex *mf, char *name)
+{
+	g_free(mf->name);
+	mf->name = g_strdup(name);
+}
+
+