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

diff --git a/camel/camel-mime-filter-index.h b/camel/camel-mime-filter-index.h
new file mode 100644
index 0000000000..b4ea1966f0
--- /dev/null
+++ b/camel/camel-mime-filter-index.h
@@ -0,0 +1,57 @@
+/*
+ *  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.
+ */
+
+#ifndef _CAMEL_MIME_FILTER_INDEX_H
+#define _CAMEL_MIME_FILTER_INDEX_H
+
+#include <gtk/gtk.h>
+#include <libibex/ibex.h>
+
+#include <camel/camel-mime-filter.h>
+
+#define CAMEL_MIME_FILTER_INDEX(obj)         GTK_CHECK_CAST (obj, camel_mime_filter_index_get_type (), CamelMimeFilterIndex)
+#define CAMEL_MIME_FILTER_INDEX_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, camel_mime_filter_index_get_type (), CamelMimeFilterIndexClass)
+#define IS_CAMEL_MIME_FILTER_INDEX(obj)      GTK_CHECK_TYPE (obj, camel_mime_filter_index_get_type ())
+
+typedef struct _CamelMimeFilterIndex      CamelMimeFilterIndex;
+typedef struct _CamelMimeFilterIndexClass CamelMimeFilterIndexClass;
+
+struct _CamelMimeFilterIndex {
+	CamelMimeFilter parent;
+
+	struct _CamelMimeFilterIndexPrivate *priv;
+
+	ibex *index;
+	char *name;
+};
+
+struct _CamelMimeFilterIndexClass {
+	CamelMimeFilterClass parent_class;
+};
+
+guint		camel_mime_filter_index_get_type	(void);
+CamelMimeFilterIndex      *camel_mime_filter_index_new	(void);
+
+CamelMimeFilterIndex      *camel_mime_filter_index_new_ibex (ibex *);
+
+/* Set the match name for any indexed words */
+void camel_mime_filter_index_set_name (CamelMimeFilterIndex *, char *);
+
+#endif /* ! _CAMEL_MIME_FILTER_INDEX_H */