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

diff --git a/camel/camel-stream-filter.h b/camel/camel-stream-filter.h
new file mode 100644
index 0000000000..b63dae275a
--- /dev/null
+++ b/camel/camel-stream-filter.h
@@ -0,0 +1,55 @@
+/*
+ *  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_STREAM_FILTER_H
+#define _CAMEL_STREAM_FILTER_H
+
+#include <gtk/gtk.h>
+
+#include <camel/camel-stream.h>
+#include <camel/camel-mime-filter.h>
+
+#define CAMEL_STREAM_FILTER(obj)         GTK_CHECK_CAST (obj, camel_stream_filter_get_type (), CamelStreamFilter)
+#define CAMEL_STREAM_FILTER_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, camel_stream_filter_get_type (), CamelStreamFilterClass)
+#define IS_CAMEL_STREAM_FILTER(obj)      GTK_CHECK_TYPE (obj, camel_stream_filter_get_type ())
+
+typedef struct _CamelStreamFilter      CamelStreamFilter;
+typedef struct _CamelStreamFilterClass CamelStreamFilterClass;
+
+struct _CamelStreamFilter {
+	CamelStream parent;
+
+	CamelStream *source;
+
+	struct _CamelStreamFilterPrivate *priv;
+};
+
+struct _CamelStreamFilterClass {
+	CamelStreamClass parent_class;
+};
+
+guint			camel_stream_filter_get_type	(void);
+
+CamelStreamFilter      *camel_stream_filter_new_with_stream	(CamelStream *stream);
+
+int camel_stream_filter_add	(CamelStreamFilter *filter, CamelMimeFilter *);
+void camel_stream_filter_remove	(CamelStreamFilter *filter, int id);
+
+#endif /* ! _CAMEL_STREAM_FILTER_H */