adjusting the headers.

@@ -6,6 +6,7 @@ pkginclude_HEADERS = \
  body.h \
  debug.h \
  envelope.h \
+ filter.h \
  folder.h \
  header.h \
  iterator.h \

@@ -19,6 +19,7 @@
 #define _MAILUTILS_BODY_H
 
 #include <sys/types.h>
+#include <mailutils/property.h>
 #include <mailutils/stream.h>
 
 #ifndef __P
@@ -46,6 +47,9 @@ extern int body_clear_modified __P ((body_t));
 extern int body_get_stream     __P ((body_t, stream_t *));
 extern int body_set_stream     __P ((body_t, stream_t, void *owner));
 
+extern int body_get_property   __P ((body_t, property_t *));
+extern int body_set_property   __P ((body_t, property_t, void *));
+
 extern int body_get_filename   __P ((body_t, char *, size_t, size_t *));
 
 extern int body_size           __P ((body_t, size_t*));

+/* GNU mailutils - a suite of utilities for electronic mail
+   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Library Public License as published by
+   the Free Software Foundation; either version 2, 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.  */
+
+/* Notes:
+
+ */
+
+#ifndef _MAILUTILS_FILTER_H
+#define _MAILUTILS_FILTER_H
+
+#include <mailutils/list.h>
+#include <mailutils/monitor.h>
+#include <mailutils/iterator.h>
+#include <mailutils/property.h>
+#include <mailutils/stream.h>
+
+#ifndef __P
+# ifdef __STDC__
+#  define __P(args) args
+# else
+#  define __P(args) ()
+# endif
+#endif /*__P */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct _filter;
+typedef struct _filter * filter_t;
+
+struct _filter
+{
+  const char *encoding;
+  int (*_init)     __P ((filter_t));
+  int (*_read)     __P ((filter_t, char *, size_t, off_t, size_t *));
+  int (*_readline) __P ((filter_t, char *, size_t, off_t, size_t *));
+  int (*_write)    __P ((filter_t, const char *, size_t, off_t, size_t *));
+  void (*_destroy) __P ((filter_t));
+  stream_t stream;
+  stream_t filter_stream;
+  property_t property;
+  int direction;
+  void *data;
+};
+
+extern int filter_create __P ((stream_t *, stream_t, const char *));
+extern int filter_get_list __P ((list_t *));
+
+extern filter_t rfc822_filter;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _MAILUTILS_FILTER_H */

@@ -66,7 +66,7 @@ extern int mailbox_message_unseen  __P ((mailbox_t, size_t *));
 extern int mailbox_expunge         __P ((mailbox_t));
 
 /* Update and scanning.  */
-extern int mailbox_size            __P ((mailbox_t, off_t *size));
+extern int mailbox_get_size        __P ((mailbox_t, off_t *size));
 extern int mailbox_is_updated      __P ((mailbox_t));
 extern int mailbox_scan            __P ((mailbox_t, size_t no, size_t *count));
 

@@ -30,6 +30,7 @@ typedef struct _message *message_t;
 #include <mailutils/stream.h>
 #include <mailutils/observer.h>
 #include <mailutils/attribute.h>
+#include <mailutils/property.h>
 #include <mailutils/mailbox.h>
 
 #ifndef __P
@@ -53,23 +54,25 @@ extern void message_destroy         __P ((message_t *, void *owner));
 extern void * message_get_owner     __P ((message_t));
 extern int message_is_modified      __P ((message_t));
 extern int message_clear_modified   __P ((message_t));
-extern int message_set_mailbox      __P ((message_t, mailbox_t));
+extern int message_set_mailbox      __P ((message_t, mailbox_t, void *));
 
 extern int message_ref              __P ((message_t));
 #define message_unref(msg)          message_destroy (&msg, NULL)
 
 extern int message_get_envelope     __P ((message_t, envelope_t *));
-extern int message_set_envelope     __P ((message_t, envelope_t, void *owner));
+extern int message_set_envelope     __P ((message_t, envelope_t, void *));
 
 extern int message_get_header       __P ((message_t, header_t *));
-extern int message_set_header       __P ((message_t, header_t, void *owner));
+extern int message_set_header       __P ((message_t, header_t, void *));
 
 extern int message_get_body         __P ((message_t, body_t *));
-extern int message_set_body         __P ((message_t, body_t, void *owner));
+extern int message_set_body         __P ((message_t, body_t, void *));
 
 extern int message_get_stream       __P ((message_t, stream_t *));
-extern int message_set_stream       __P ((message_t, stream_t, void *owner));
+extern int message_set_stream       __P ((message_t, stream_t, void *));
 
+extern int message_get_property     __P ((message_t, property_t *));
+extern int message_set_property     __P ((message_t, property_t, void *));
 extern int message_get_attribute    __P ((message_t, attribute_t *));
 extern int message_set_attribute    __P ((message_t, attribute_t, void *));
 

@@ -19,7 +19,6 @@
 #define _MAILUTILS_PROPERTY_H
 
 #include <sys/types.h>
-#include <mailutils/list.h>
 
 #ifndef __P
 # ifdef __STDC__
@@ -36,26 +35,24 @@ extern "C" {
 struct _property;
 typedef struct _property *property_t;
 
-struct property_list
-{
-  char *key;
-  int value;
-  void *private_; /* Private data.  */
-};
-
 extern int property_create   __P ((property_t *, void *));
 extern void property_destroy __P ((property_t *, void *));
 extern void *property_get_owner __P ((property_t));
 
-extern int property_set_value   __P ((property_t, const char *, int));
-extern int property_get_value  __P ((property_t, const char *, int *));
-extern int property_add_default __P ((property_t, const char *, int *, void *));
+extern int property_set_value __P ((property_t, const char *, const char *));
+extern int property_get_value
+__P ((property_t, const char *, char *, size_t, size_t *));
 
-extern int property_set  __P ((property_t, const char *));
-extern int property_unset  __P ((property_t, const char *));
-extern int property_is_set  __P ((property_t, const char *));
+extern int property_add_defaults
+__P ((property_t, const char *, const char *,
+      int (*) __P ((property_t, const char *, const char *)),
+      int (*) __P ((property_t, const char *, char *, size_t, size_t *)),
+      void *));
 
-extern int property_get_list __P ((property_t, list_t *));
+/* Helper functions.  */
+extern int property_set  __P ((property_t, const char *));
+extern int property_unset __P ((property_t, const char *));
+extern int property_is_set __P ((property_t, const char *));
 
 #ifdef __cplusplus
 }

@@ -20,6 +20,8 @@
 
 #include <sys/types.h>
 
+#include <mailutils/property.h>
+
 #ifdef __cplusplus
 extern "C" { /*}*/
 #endif
@@ -43,6 +45,7 @@ typedef struct _stream *stream_t;
 #define MU_STREAM_NONBLOCK 0x00000020
 /* Stream will be destroy on stream_destroy whitout checking the owner.  */
 #define MU_STREAM_NO_CHECK 0x00000040
+#define MU_STREAM_SEEKABLE 0x00000080
 
 extern int stream_create       __P ((stream_t *, int flags, void *owner));
 extern void stream_destroy     __P ((stream_t *, void *owner));
@@ -58,6 +61,8 @@ extern int stream_close        __P ((stream_t));
 extern int stream_set_close    __P ((stream_t, int (*_close) __P ((stream_t)),
 				     void *owner));
 
+extern int stream_is_seekable  __P ((stream_t));
+
 extern int stream_get_fd       __P ((stream_t , int *));
 extern int stream_set_fd       __P ((stream_t, int (*_get_fd)(stream_t, int *),
 				     void *owner));
@@ -94,7 +99,7 @@ extern int stream_set_write    __P ((stream_t, int
 						     size_t, off_t, size_t *)),
 				     void *owner));
 
-  extern int stream_setbufsiz    __P ((stream_t stream, size_t size));
+extern int stream_setbufsiz    __P ((stream_t stream, size_t size));
 extern int stream_flush        __P ((stream_t));
 extern int stream_set_flush    __P ((stream_t, int (*_flush)
 				     __P ((stream_t)), void *owner));
@@ -102,6 +107,9 @@ extern int stream_set_flush    __P ((stream_t, int (*_flush)
 extern int stream_get_flags    __P ((stream_t, int *pflags));
 extern int stream_set_flags    __P ((stream_t, int flags));
 
+extern int stream_get_property __P ((stream_t, property_t *));
+extern int stream_set_property __P ((stream_t, property_t, void *));
+
 #define MU_STREAM_STATE_OPEN  1
 #define MU_STREAM_STATE_READ  2
 #define MU_STREAM_STATE_WRITE 4