evolution-data-server r9168 - in trunk: camel camel/providers/imap camel/providers/imap4 camel/providers/imapp camel/providers/local camel/providers/nntp docs/reference/camel docs/reference/camel/tmpl



Author: mbarnes
Date: Wed Jul 23 03:06:32 2008
New Revision: 9168
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9168&view=rev

Log:
2008-07-22  Matthew Barnes  <mbarnes redhat com>

	** Fix a bunch of Gtk-Doc warnings in Camel.



Modified:
   trunk/camel/ChangeLog
   trunk/camel/camel-address.c
   trunk/camel/camel-charset-map.c
   trunk/camel/camel-cipher-context.c
   trunk/camel/camel-cipher-context.h
   trunk/camel/camel-data-cache.c
   trunk/camel/camel-data-cache.h
   trunk/camel/camel-data-wrapper.c
   trunk/camel/camel-disco-store.h
   trunk/camel/camel-exception.c
   trunk/camel/camel-file-utils.c
   trunk/camel/camel-file-utils.h
   trunk/camel/camel-filter-driver.c
   trunk/camel/camel-filter-driver.h
   trunk/camel/camel-filter-search.c
   trunk/camel/camel-folder-search.h
   trunk/camel/camel-folder-summary.c
   trunk/camel/camel-folder-summary.h
   trunk/camel/camel-folder-thread.h
   trunk/camel/camel-folder.c
   trunk/camel/camel-gpg-context.c
   trunk/camel/camel-internet-address.c
   trunk/camel/camel-internet-address.h
   trunk/camel/camel-medium.c
   trunk/camel/camel-mime-filter-basic.c
   trunk/camel/camel-mime-filter-bestenc.c
   trunk/camel/camel-mime-filter-canon.c
   trunk/camel/camel-mime-filter-charset.c
   trunk/camel/camel-mime-filter-crlf.c
   trunk/camel/camel-mime-filter-enriched.c
   trunk/camel/camel-mime-filter-from.c
   trunk/camel/camel-mime-filter-gzip.c
   trunk/camel/camel-mime-filter-html.c
   trunk/camel/camel-mime-filter-index.c
   trunk/camel/camel-mime-filter-progress.c
   trunk/camel/camel-mime-filter-save.c
   trunk/camel/camel-mime-filter-tohtml.c
   trunk/camel/camel-mime-filter-windows.c
   trunk/camel/camel-mime-filter-yenc.c
   trunk/camel/camel-mime-filter.c
   trunk/camel/camel-mime-message.c
   trunk/camel/camel-mime-parser.h
   trunk/camel/camel-mime-part.c
   trunk/camel/camel-mime-part.h
   trunk/camel/camel-mime-utils.c
   trunk/camel/camel-mime-utils.h
   trunk/camel/camel-multipart-encrypted.c
   trunk/camel/camel-multipart-signed.c
   trunk/camel/camel-multipart.c
   trunk/camel/camel-nntp-address.c
   trunk/camel/camel-nntp-address.h
   trunk/camel/camel-object.h
   trunk/camel/camel-offline-folder.h
   trunk/camel/camel-offline-journal.c
   trunk/camel/camel-operation.c
   trunk/camel/camel-provider.c
   trunk/camel/camel-sasl-anonymous.c
   trunk/camel/camel-sasl.c
   trunk/camel/camel-seekable-stream.c
   trunk/camel/camel-seekable-substream.c
   trunk/camel/camel-service.c
   trunk/camel/camel-session.c
   trunk/camel/camel-smime-context.c
   trunk/camel/camel-store-summary.c
   trunk/camel/camel-store.c
   trunk/camel/camel-store.h
   trunk/camel/camel-stream-buffer.c
   trunk/camel/camel-stream-filter.c
   trunk/camel/camel-stream-fs.c
   trunk/camel/camel-stream-mem.c
   trunk/camel/camel-stream-null.c
   trunk/camel/camel-stream-vfs.c
   trunk/camel/camel-stream-vfs.h
   trunk/camel/camel-stream.c
   trunk/camel/camel-tcp-stream-openssl.c
   trunk/camel/camel-tcp-stream-raw.c
   trunk/camel/camel-tcp-stream-ssl.c
   trunk/camel/camel-tcp-stream.c
   trunk/camel/camel-url.c
   trunk/camel/camel-vee-folder.c
   trunk/camel/camel-vee-folder.h
   trunk/camel/camel-vee-store.c
   trunk/camel/camel-vtrash-folder.c
   trunk/camel/camel-vtrash-folder.h
   trunk/camel/providers/imap/camel-imap-command.h
   trunk/camel/providers/imap/camel-imap-folder.h
   trunk/camel/providers/imap/camel-imap-message-cache.h
   trunk/camel/providers/imap/camel-imap-store-summary.c
   trunk/camel/providers/imap/camel-imap-types.h
   trunk/camel/providers/imap/camel-imap-wrapper.h
   trunk/camel/providers/imap4/camel-imap4-engine.c
   trunk/camel/providers/imap4/camel-imap4-store-summary.c
   trunk/camel/providers/imap4/camel-imap4-stream.c
   trunk/camel/providers/imap4/camel-imap4-utils.c
   trunk/camel/providers/imapp/camel-imapp-store-summary.c
   trunk/camel/providers/imapp/camel-imapp-summary.c
   trunk/camel/providers/imapp/camel-imapp-utils.h
   trunk/camel/providers/local/camel-local-folder.h
   trunk/camel/providers/nntp/camel-nntp-folder.h
   trunk/camel/providers/nntp/camel-nntp-store-summary.c
   trunk/camel/providers/nntp/camel-nntp-store.h
   trunk/docs/reference/camel/camel-sections.txt
   trunk/docs/reference/camel/tmpl/camel-cipher-context.sgml
   trunk/docs/reference/camel/tmpl/camel-data-cache.sgml
   trunk/docs/reference/camel/tmpl/camel-disco-store.sgml
   trunk/docs/reference/camel/tmpl/camel-file-utils.sgml
   trunk/docs/reference/camel/tmpl/camel-filter-driver.sgml
   trunk/docs/reference/camel/tmpl/camel-folder-search.sgml
   trunk/docs/reference/camel/tmpl/camel-folder-summary.sgml
   trunk/docs/reference/camel/tmpl/camel-folder-thread.sgml
   trunk/docs/reference/camel/tmpl/camel-folder.sgml
   trunk/docs/reference/camel/tmpl/camel-imap-command.sgml
   trunk/docs/reference/camel/tmpl/camel-imap-message-cache.sgml
   trunk/docs/reference/camel/tmpl/camel-imap-utils.sgml
   trunk/docs/reference/camel/tmpl/camel-imapp-utils.sgml
   trunk/docs/reference/camel/tmpl/camel-internet-address.sgml
   trunk/docs/reference/camel/tmpl/camel-mime-parser.sgml
   trunk/docs/reference/camel/tmpl/camel-mime-part.sgml
   trunk/docs/reference/camel/tmpl/camel-mime-utils.sgml
   trunk/docs/reference/camel/tmpl/camel-nntp-address.sgml
   trunk/docs/reference/camel/tmpl/camel-object.sgml
   trunk/docs/reference/camel/tmpl/camel-offline-folder.sgml
   trunk/docs/reference/camel/tmpl/camel-store.sgml
   trunk/docs/reference/camel/tmpl/camel-vee-folder.sgml
   trunk/docs/reference/camel/tmpl/camel-vee-summary.sgml
   trunk/docs/reference/camel/tmpl/camel-vtrash-folder.sgml

Modified: trunk/camel/camel-address.c
==============================================================================
--- trunk/camel/camel-address.c	(original)
+++ trunk/camel/camel-address.c	Wed Jul 23 03:06:32 2008
@@ -69,7 +69,7 @@
  *
  * Create a new #CamelAddress object.
  * 
- * Returns a new #CamelAddress object
+ * Returns: a new #CamelAddress object
  **/
 CamelAddress *
 camel_address_new (void)
@@ -85,7 +85,7 @@
  * 
  * Clone an existing address type.
  * 
- * Returns the cloned address
+ * Returns: the cloned address
  **/
 CamelAddress *
 camel_address_new_clone (const CamelAddress *addr)
@@ -103,7 +103,7 @@
  * 
  * Get the number of addresses stored in the address @addr.
  * 
- * Returns the number of addresses contained in @addr
+ * Returns: the number of addresses contained in @addr
  **/
 int
 camel_address_length (CamelAddress *addr)
@@ -119,7 +119,7 @@
  *
  * Construct a new address from a raw address field.
  *
- * Returns the number of addresses parsed or %-1 on fail
+ * Returns: the number of addresses parsed or %-1 on fail
  **/
 int
 camel_address_decode (CamelAddress *addr, const char *raw)
@@ -136,7 +136,7 @@
  * 
  * Encode an address in a format suitable for a raw header.
  * 
- * Returns the encoded address
+ * Returns: the encoded address
  **/
 char *
 camel_address_encode (CamelAddress *addr)
@@ -155,7 +155,7 @@
  * Attempt to convert a previously formatted and/or edited
  * address back into internal form.
  * 
- * Returns the number of addresses parsed or %-1 on fail
+ * Returns: the number of addresses parsed or %-1 on fail
  **/
 int
 camel_address_unformat(CamelAddress *addr, const char *raw)
@@ -172,7 +172,7 @@
  * 
  * Format an address in a format suitable for display.
  * 
- * Returns a newly allocated string containing the formatted addresses
+ * Returns: a newly allocated string containing the formatted addresses
  **/
 char *
 camel_address_format (CamelAddress *addr)
@@ -191,7 +191,7 @@
  * Concatenate one address onto another. The addresses must
  * be of the same type.
  * 
- * Returns the number of addresses concatenated
+ * Returns: the number of addresses concatenated
  **/
 int
 camel_address_cat (CamelAddress *dest, const CamelAddress *source)
@@ -210,7 +210,7 @@
  * 
  * Copy the contents of one address into another.
  * 
- * Returns the number of addresses copied
+ * Returns: the number of addresses copied
  **/
 int
 camel_address_copy (CamelAddress *dest, const CamelAddress *source)

Modified: trunk/camel/camel-charset-map.c
==============================================================================
--- trunk/camel/camel-charset-map.c	(original)
+++ trunk/camel/camel-charset-map.c	Wed Jul 23 03:06:32 2008
@@ -393,7 +393,7 @@
  * camel_charset_iso_to_windows:
  * @isocharset: a canonicalised ISO charset
  *
- * Returns the equivalent Windows charset.
+ * Returns: the equivalent Windows charset.
  **/
 const char *
 camel_charset_iso_to_windows (const char *isocharset)

Modified: trunk/camel/camel-cipher-context.c
==============================================================================
--- trunk/camel/camel-cipher-context.c	(original)
+++ trunk/camel/camel-cipher-context.c	Wed Jul 23 03:06:32 2008
@@ -282,7 +282,7 @@
  * Imports a stream of keys/certificates contained within @istream
  * into the key/certificate database controlled by @ctx.
  *
- * Returns 0 on success or -1 on fail.
+ * Returns: 0 on success or -1 on fail.
  **/
 int
 camel_cipher_import_keys (CamelCipherContext *context, struct _CamelStream *istream, CamelException *ex)
@@ -313,7 +313,7 @@
  * Exports the keys/certificates in @keys to the stream @ostream from
  * the key/certificate database controlled by @ctx.
  *
- * Returns 0 on success or -1 on fail.
+ * Returns: 0 on success or -1 on fail.
  **/
 int
 camel_cipher_export_keys (CamelCipherContext *context, GPtrArray *keys,

Modified: trunk/camel/camel-cipher-context.h
==============================================================================
--- trunk/camel/camel-cipher-context.h	(original)
+++ trunk/camel/camel-cipher-context.h	Wed Jul 23 03:06:32 2008
@@ -176,7 +176,7 @@
 void                 camel_cipher_validity_clear (CamelCipherValidity *validity);
 CamelCipherValidity *camel_cipher_validity_clone(CamelCipherValidity *vin);
 void		     camel_cipher_validity_add_certinfo(CamelCipherValidity *vin, camel_cipher_validity_mode_t mode, const char *name, const char *email);
-void		     camel_cipher_validity_envelope(CamelCipherValidity *valid, CamelCipherValidity *outer);
+void		     camel_cipher_validity_envelope(CamelCipherValidity *parent, CamelCipherValidity *valid);
 void                 camel_cipher_validity_free (CamelCipherValidity *validity);
 
 /* utility functions */

Modified: trunk/camel/camel-data-cache.c
==============================================================================
--- trunk/camel/camel-data-cache.c	(original)
+++ trunk/camel/camel-data-cache.c	Wed Jul 23 03:06:32 2008
@@ -414,8 +414,7 @@
 /**
  * camel_data_cache_clear:
  * @cache: 
- * @path: Path to clear, or NULL to clear all items in
- * all paths.
+ * @path: Path to clear, or NULL to clear all items in all paths.
  * @ex: 
  * 
  * Clear all items in a given cache path or all items in the cache.

Modified: trunk/camel/camel-data-cache.h
==============================================================================
--- trunk/camel/camel-data-cache.h	(original)
+++ trunk/camel/camel-data-cache.h	Wed Jul 23 03:06:32 2008
@@ -69,17 +69,17 @@
 /* public methods */
 CamelDataCache *camel_data_cache_new(const char *path, guint32 flags, CamelException *ex);
 
-void camel_data_cache_set_expire_age(CamelDataCache *cache, time_t when);
+void camel_data_cache_set_expire_age(CamelDataCache *cdc, time_t when);
 void camel_data_cache_set_expire_access(CamelDataCache *cdc, time_t when);
 
 int             camel_data_cache_rename(CamelDataCache *cache,
 					const char *old, const char *new, CamelException *ex);
 
-CamelStream    *camel_data_cache_add(CamelDataCache *cache,
+CamelStream    *camel_data_cache_add(CamelDataCache *cdc,
 				     const char *path, const char *key, CamelException *ex);
-CamelStream    *camel_data_cache_get(CamelDataCache *cache,
+CamelStream    *camel_data_cache_get(CamelDataCache *cdc,
 				     const char *path, const char *key, CamelException *ex);
-int             camel_data_cache_remove(CamelDataCache *cache,
+int             camel_data_cache_remove(CamelDataCache *cdc,
 					const char *path, const char *key, CamelException *ex);
 
 int             camel_data_cache_clear(CamelDataCache *cache,

Modified: trunk/camel/camel-data-wrapper.c
==============================================================================
--- trunk/camel/camel-data-wrapper.c	(original)
+++ trunk/camel/camel-data-wrapper.c	Wed Jul 23 03:06:32 2008
@@ -121,7 +121,7 @@
  *
  * Create a new #CamelDataWrapper object.
  *
- * Returns a new #CamelDataWrapper object
+ * Returns: a new #CamelDataWrapper object
  **/
 CamelDataWrapper *
 camel_data_wrapper_new (void)
@@ -162,7 +162,7 @@
  * equivalent data wrapper object later by passing this stream to
  * #camel_data_wrapper_construct_from_stream.
  *
- * Returns the number of bytes written, or %-1 on fail
+ * Returns: the number of bytes written, or %-1 on fail
  **/
 ssize_t
 camel_data_wrapper_write_to_stream (CamelDataWrapper *data_wrapper,
@@ -226,7 +226,7 @@
  *
  * Writes the decoded data content to @stream.
  *
- * Returns the number of bytes written, or %-1 on fail
+ * Returns: the number of bytes written, or %-1 on fail
  **/
 ssize_t
 camel_data_wrapper_decode_to_stream (CamelDataWrapper *data_wrapper,
@@ -258,7 +258,7 @@
  *
  * Constructs the content of @data_wrapper from the supplied @stream.
  *
- * Returns %0 on success or %-1 on fail
+ * Returns: %0 on success or %-1 on fail
  **/
 int
 camel_data_wrapper_construct_from_stream (CamelDataWrapper *data_wrapper,
@@ -314,7 +314,7 @@
  * camel_data_wrapper_get_mime_type:
  * @data_wrapper: a #CamelDataWrapper object
  *
- * Returns the MIME type which must be freed by the caller
+ * Returns: the MIME type which must be freed by the caller
  **/
 char *
 camel_data_wrapper_get_mime_type (CamelDataWrapper *data_wrapper)
@@ -336,7 +336,7 @@
  * camel_data_wrapper_get_mime_type_field:
  * @data_wrapper: a #CamelDataWrapper object
  *
- * Returns the parsed form of the data wrapper's MIME type
+ * Returns: the parsed form of the data wrapper's MIME type
  **/
 CamelContentType *
 camel_data_wrapper_get_mime_type_field (CamelDataWrapper *data_wrapper)
@@ -388,7 +388,7 @@
  * camel_data_wrapper_is_offline:
  * @data_wrapper: a #CamelDataWrapper object
  *
- * Returns whether @data_wrapper is "offline" (data stored
+ * Returns: whether @data_wrapper is "offline" (data stored
  * remotely) or not. Some optional code paths may choose to not
  * operate on offline data.
  **/

Modified: trunk/camel/camel-disco-store.h
==============================================================================
--- trunk/camel/camel-disco-store.h	(original)
+++ trunk/camel/camel-disco-store.h	Wed Jul 23 03:06:32 2008
@@ -104,11 +104,11 @@
 CamelType camel_disco_store_get_type (void);
 
 /* Public methods */
-CamelDiscoStoreStatus camel_disco_store_status           (CamelDiscoStore *);
-void                  camel_disco_store_set_status       (CamelDiscoStore *,
-							  CamelDiscoStoreStatus,
-							  CamelException *);
-gboolean              camel_disco_store_can_work_offline (CamelDiscoStore *);
+CamelDiscoStoreStatus camel_disco_store_status           (CamelDiscoStore *store);
+void                  camel_disco_store_set_status       (CamelDiscoStore *store,
+							  CamelDiscoStoreStatus status,
+							  CamelException *ex);
+gboolean              camel_disco_store_can_work_offline (CamelDiscoStore *store);
 
 
 /* Convenience functions */

Modified: trunk/camel/camel-exception.c
==============================================================================
--- trunk/camel/camel-exception.c	(original)
+++ trunk/camel/camel-exception.c	Wed Jul 23 03:06:32 2008
@@ -45,7 +45,7 @@
  * 
  * Create and returns a new exception object.
  * 
- * Returns the newly allocated exception object
+ * Returns: the newly allocated exception object
  **/
 CamelException *
 camel_exception_new (void)
@@ -228,7 +228,7 @@
  * 
  * Get the id of an exception.
  * 
- * Returns the exception id (#CAMEL_EXCEPTION_NONE will be returned if
+ * Returns: the exception id (#CAMEL_EXCEPTION_NONE will be returned if
  * @ex is %NULL or unset)
  **/
 ExceptionId
@@ -248,7 +248,7 @@
  * 
  * Get the exception description text.
  * 
- * Returns the exception description text (%NULL will be returned if
+ * Returns: the exception description text (%NULL will be returned if
  * @ex is %NULL or unset)
  **/
 const gchar *

Modified: trunk/camel/camel-file-utils.c
==============================================================================
--- trunk/camel/camel-file-utils.c	(original)
+++ trunk/camel/camel-file-utils.c	Wed Jul 23 03:06:32 2008
@@ -390,7 +390,7 @@
  * 'Flattens' @name into a safe filename string by hex encoding any
  * chars that may cause problems on the filesystem.
  *
- * Returns a safe filename string.
+ * Returns: a safe filename string.
  **/
 char *
 camel_file_util_safe_filename (const char *name)
@@ -421,7 +421,7 @@
  * Code that intends to be portable to Win32 should call this function
  * only on file descriptors returned from open(), not on sockets.
  *
- * Returns number of bytes read or -1 on fail. On failure, errno will
+ * Returns: number of bytes read or -1 on fail. On failure, errno will
  * be set appropriately.
  **/
 ssize_t
@@ -499,7 +499,7 @@
  * Code that intends to be portable to Win32 should call this function
  * only on file descriptors returned from open(), not on sockets.
  *
- * Returns number of bytes written or -1 on fail. On failure, errno will
+ * Returns: number of bytes written or -1 on fail. On failure, errno will
  * be set appropriately.
  **/
 ssize_t
@@ -589,7 +589,7 @@
  * portable to Win32 should call this function only on sockets
  * returned from socket(), or accept().
  *
- * Returns number of bytes read or -1 on fail. On failure, errno will
+ * Returns: number of bytes read or -1 on fail. On failure, errno will
  * be set appropriately. If the socket is nonblocking
  * camel_read_socket() will retry the read until it gets something.
  **/
@@ -660,7 +660,7 @@
  * be portable to Win32 should call this function only on sockets
  * returned from socket() or accept().
  *
- * Returns number of bytes written or -1 on fail. On failure, errno will
+ * Returns: number of bytes written or -1 on fail. On failure, errno will
  * be set appropriately.
  **/
 ssize_t

Modified: trunk/camel/camel-file-utils.h
==============================================================================
--- trunk/camel/camel-file-utils.h	(original)
+++ trunk/camel/camel-file-utils.h	Wed Jul 23 03:06:32 2008
@@ -39,18 +39,18 @@
 
 G_BEGIN_DECLS
 
-int camel_file_util_encode_fixed_int32 (FILE *out, gint32);
-int camel_file_util_decode_fixed_int32 (FILE *in, gint32 *);
-int camel_file_util_encode_uint32 (FILE *out, guint32);
-int camel_file_util_decode_uint32 (FILE *in, guint32 *);
-int camel_file_util_encode_time_t (FILE *out, time_t);
-int camel_file_util_decode_time_t (FILE *in, time_t *);
-int camel_file_util_encode_off_t (FILE *out, off_t);
-int camel_file_util_decode_off_t (FILE *in, off_t *);
-int camel_file_util_encode_size_t (FILE *out, size_t);
-int camel_file_util_decode_size_t (FILE *in, size_t *);
-int camel_file_util_encode_string (FILE *out, const char *);
-int camel_file_util_decode_string (FILE *in, char **);
+int camel_file_util_encode_fixed_int32 (FILE *out, gint32 value);
+int camel_file_util_decode_fixed_int32 (FILE *in, gint32 *dest);
+int camel_file_util_encode_uint32 (FILE *out, guint32 value);
+int camel_file_util_decode_uint32 (FILE *in, guint32 *dest);
+int camel_file_util_encode_time_t (FILE *out, time_t value);
+int camel_file_util_decode_time_t (FILE *in, time_t *dest);
+int camel_file_util_encode_off_t (FILE *out, off_t value);
+int camel_file_util_decode_off_t (FILE *in, off_t *dest);
+int camel_file_util_encode_size_t (FILE *out, size_t value);
+int camel_file_util_decode_size_t (FILE *in, size_t *dest);
+int camel_file_util_encode_string (FILE *out, const char *str);
+int camel_file_util_decode_string (FILE *in, char **str);
 int camel_file_util_encode_fixed_string (FILE *out, const char *str, size_t len);
 int camel_file_util_decode_fixed_string (FILE *in, char **str, size_t len);
 

Modified: trunk/camel/camel-filter-driver.c
==============================================================================
--- trunk/camel/camel-filter-driver.c	(original)
+++ trunk/camel/camel-filter-driver.c	Wed Jul 23 03:06:32 2008
@@ -1170,7 +1170,7 @@
  * object. Is more efficient as it doesn't need to open the folder
  * through Camel directly.
  *
- * Returns -1 if errors were encountered during filtering,
+ * Returns: -1 if errors were encountered during filtering,
  * otherwise returns 0.
  *
  **/
@@ -1275,7 +1275,7 @@
  * Filters a folder based on rules defined in the FilterDriver
  * object.
  *
- * Returns -1 if errors were encountered during filtering,
+ * Returns: -1 if errors were encountered during filtering,
  * otherwise returns 0.
  *
  **/
@@ -1403,7 +1403,7 @@
  * certain cases is more efficient than using the default
  * camel_folder_append_message() function).
  *
- * Returns -1 if errors were encountered during filtering,
+ * Returns: -1 if errors were encountered during filtering,
  * otherwise returns 0.
  *
  **/

Modified: trunk/camel/camel-filter-driver.h
==============================================================================
--- trunk/camel/camel-filter-driver.h	(original)
+++ trunk/camel/camel-filter-driver.h	Wed Jul 23 03:06:32 2008
@@ -90,7 +90,7 @@
 void camel_filter_driver_flush                (CamelFilterDriver *driver, CamelException *ex);
 
 int  camel_filter_driver_filter_message       (CamelFilterDriver *driver, CamelMimeMessage *message,
-					       CamelMessageInfo *info, const char *uri,
+					       CamelMessageInfo *info, const char *uid,
 					       CamelFolder *source, const char *source_url,
 					       const char *original_source_url, CamelException *ex);
 

Modified: trunk/camel/camel-filter-search.c
==============================================================================
--- trunk/camel/camel-filter-search.c	(original)
+++ trunk/camel/camel-filter-search.c	Wed Jul 23 03:06:32 2008
@@ -698,7 +698,8 @@
  * @expression:
  * @ex:
  *
- * Returns one of CAMEL_SEARCH_MATCHED, CAMEL_SEARCH_NOMATCH, or CAMEL_SEARCH_ERROR.
+ * Returns: one of CAMEL_SEARCH_MATCHED, CAMEL_SEARCH_NOMATCH, or
+ * CAMEL_SEARCH_ERROR.
  **/
 int
 camel_filter_search_match (CamelSession *session,

Modified: trunk/camel/camel-folder-search.h
==============================================================================
--- trunk/camel/camel-folder-search.h	(original)
+++ trunk/camel/camel-folder-search.h	Wed Jul 23 03:06:32 2008
@@ -51,8 +51,9 @@
 
 	GString *query; /* shall contain the SQL quer that should be executed */
 
-// DEPRECATED	
-//	GHashTable *summary_hash; /* hashtable of summary items */
+#if 0  /* DEPRECATED */
+	GHashTable *summary_hash; /* hashtable of summary items */
+#endif
 	CamelMessageInfo *current; /* current message info, when searching one by one */
 	CamelMimeMessage *current_message; /* cache of current message, if required */
 	CamelIndex *body_index;

Modified: trunk/camel/camel-folder-summary.c
==============================================================================
--- trunk/camel/camel-folder-summary.c	(original)
+++ trunk/camel/camel-folder-summary.c	Wed Jul 23 03:06:32 2008
@@ -270,7 +270,7 @@
  *
  * Create a new #CamelFolderSummary object.
  * 
- * Returns a new #CamelFolderSummary object
+ * Returns: a new #CamelFolderSummary object
  **/
 CamelFolderSummary *
 camel_folder_summary_new (struct _CamelFolder *folder)
@@ -351,7 +351,7 @@
  * 
  * Get the number of summary items stored in this summary.
  * 
- * Returns the number of items in the summary
+ * Returns: the number of items in the summary
  **/
 int
 camel_folder_summary_count(CamelFolderSummary *s)
@@ -370,7 +370,7 @@
  * A referenced to the summary item is returned, which may be
  * ref'd or free'd as appropriate.
  * 
- * Returns the summary item, or %NULL if @index is out of range
+ * Returns: the summary item, or %NULL if @index is out of range
  **/
 CamelMessageInfo *
 camel_folder_summary_index (CamelFolderSummary *s, int i)
@@ -403,15 +403,15 @@
 
 /**
  * camel_folder_summary_uid_from_index:
- * @summary: a #CamelFolderSummary object
- * @index: item index
+ * @s: a #CamelFolderSummary object
+ * @i: item index
  * 
  * Retrieve a summary item's uid  by index number.
  *
  * A newly allocated uid is returned, which must be
  * free'd as appropriate.
  * 
- * Returns the summary item's uid , or %NULL if @index is out of range   
+ * Returns: the summary item's uid , or %NULL if @index is out of range   
  **/
 char *
 camel_folder_summary_uid_from_index (CamelFolderSummary *s, int i)
@@ -438,7 +438,7 @@
  *
  * It must be freed using g_ptr_array_free
  *
- * Returns a #GPtrArray of uids
+ * Returns: a #GPtrArray of uids
  **/
 GPtrArray *
 camel_folder_summary_array(CamelFolderSummary *s)
@@ -537,7 +537,7 @@
  * A referenced to the summary item is returned, which may be
  * ref'd or free'd as appropriate.
  * 
- * Returns the summary item, or %NULL if the uid @uid is not available
+ * Returns: the summary item, or %NULL if the uid @uid is not available
  **/
 CamelMessageInfo *
 camel_folder_summary_uid (CamelFolderSummary *s, const char *uid)
@@ -552,7 +552,7 @@
  * Generate a new unique uid value as an integer.  This
  * may be used to create a unique sequence of numbers.
  * 
- * Returns the next unique uid value
+ * Returns: the next unique uid value
  **/
 guint32
 camel_folder_summary_next_uid(CamelFolderSummary *s)
@@ -599,7 +599,7 @@
  *
  * Retrieve the next uid, but as a formatted string.
  *
- * Returns the next uid as an unsigned integer string.
+ * Returns: the next uid as an unsigned integer string.
  * This string must be freed by the caller.
  **/
 char *
@@ -964,7 +964,7 @@
  *
  * Load the summary from disk.
  *
- * Returns %0 on success or %-1 on fail
+ * Returns: %0 on success or %-1 on fail
  **/
 int
 camel_folder_summary_load(CamelFolderSummary *s)
@@ -1270,7 +1270,7 @@
  * Writes the summary to disk.  The summary is only written if changes
  * have occured.
  * 
- * Returns %0 on success or %-1 on fail
+ * Returns: %0 on success or %-1 on fail
  **/
 int
 camel_folder_summary_save(CamelFolderSummary *s)
@@ -1443,7 +1443,7 @@
  * keep the rest on disk.  This should only be done on
  * a fresh summary object.
  * 
- * Returns %0 on success or %-1 on fail
+ * Returns: %0 on success or %-1 on fail
  **/
 int
 camel_folder_summary_header_load(CamelFolderSummary *s)
@@ -1603,7 +1603,7 @@
  * Note that this function should not be used if build_content_info
  * has been specified for this summary.
  * 
- * Returns the newly added record
+ * Returns: the newly added record
  **/
 CamelMessageInfo *
 camel_folder_summary_add_from_header(CamelFolderSummary *s, struct _camel_header_raw *h)
@@ -1627,7 +1627,7 @@
  * This function may be used if build_contnet_info or an index has been
  * specified for the summary.
  * 
- * Returns the newly added record
+ * Returns: the newly added record
  **/
 CamelMessageInfo *
 camel_folder_summary_add_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)
@@ -1652,7 +1652,7 @@
  * 
  * Add a summary item from an existing message.
  * 
- * Returns the newly added record
+ * Returns: the newly added record
  **/
 CamelMessageInfo *
 camel_folder_summary_add_from_message (CamelFolderSummary *s, CamelMimeMessage *msg)
@@ -1672,7 +1672,7 @@
  * 
  * Create a new info record from a header.
  *
- * Returns the newly allocated record which must be freed with
+ * Returns: the newly allocated record which must be freed with
  * #camel_message_info_free
  **/
 CamelMessageInfo *
@@ -1700,7 +1700,7 @@
  * Once complete, the parser will be positioned at the end of
  * the message.
  *
- * Returns the newly allocated record which must be freed with
+ * Returns: the newly allocated record which must be freed with
  * #camel_message_info_free
  **/
 CamelMessageInfo *
@@ -1760,7 +1760,7 @@
  * 
  * Create a summary item from a message.
  * 
- * Returns the newly allocated record which must be freed using
+ * Returns: the newly allocated record which must be freed using
  * #camel_message_info_free
  **/
 CamelMessageInfo *
@@ -2156,7 +2156,7 @@
  * to reduce the size taken for common mailer words.  This
  * can still be used to encode normal strings as well.
  * 
- * Returns %0 on success or %-1 on fail
+ * Returns: %0 on success or %-1 on fail
  **/
 int
 camel_folder_summary_encode_token(FILE *out, const char *str)
@@ -2209,7 +2209,7 @@
  * 
  * Decode a token value.
  * 
- * Returns %0 on success or %-1 on fail
+ * Returns: %0 on success or %-1 on fail
  **/
 int
 camel_folder_summary_decode_token(FILE *in, char **str)
@@ -2588,7 +2588,7 @@
  * Allocate a new #CamelMessageContentInfo, suitable for adding
  * to this summary.
  * 
- * Returns a newly allocated #CamelMessageContentInfo
+ * Returns: a newly allocated #CamelMessageContentInfo
  **/
 CamelMessageContentInfo *
 camel_folder_summary_content_info_new(CamelFolderSummary *s)
@@ -3555,7 +3555,7 @@
  * 
  * Find the state of the flag @name in @list.
  * 
- * Returns the state of the flag (%TRUE or %FALSE)
+ * Returns: the state of the flag (%TRUE or %FALSE)
  **/
 gboolean
 camel_flag_get(CamelFlag **list, const char *name)
@@ -3579,7 +3579,7 @@
  * 
  * Set the state of a flag @name in the list @list to @value.
  *
- * Returns %TRUE if the value of the flag has been changed or %FALSE
+ * Returns: %TRUE if the value of the flag has been changed or %FALSE
  * otherwise
  **/
 gboolean
@@ -3620,7 +3620,7 @@
  * 
  * Get the length of the flag list.
  * 
- * Returns the number of flags in the list
+ * Returns: the number of flags in the list
  **/
 int
 camel_flag_list_size(CamelFlag **list)
@@ -3664,7 +3664,7 @@
  * 
  * Copy a flag list.
  * 
- * Returns %TRUE if @to is changed or %FALSE otherwise
+ * Returns: %TRUE if @to is changed or %FALSE otherwise
  **/
 gboolean
 camel_flag_list_copy(CamelFlag **to, CamelFlag **from)
@@ -3706,7 +3706,7 @@
  *
  * Find the flag @name in @list and get the value.
  * 
- * Returns the value of the flag  or %NULL if unset
+ * Returns: the value of the flag  or %NULL if unset
  **/
 const char *
 camel_tag_get(CamelTag **list, const char *name)
@@ -3731,7 +3731,7 @@
  * 
  * Set the tag @name in the tag list @list to @value.
  *
- * Returns %TRUE if the value on the tag changed or %FALSE otherwise
+ * Returns: %TRUE if the value on the tag changed or %FALSE otherwise
  **/
 gboolean
 camel_tag_set(CamelTag **list, const char *name, const char *value)
@@ -3776,7 +3776,7 @@
  * 
  * Get the number of tags present in the tag list @list.
  * 
- * Returns the number of tags
+ * Returns: the number of tags
  **/
 int
 camel_tag_list_size(CamelTag **list)
@@ -3806,7 +3806,7 @@
  * 
  * Copy a tag list.
  * 
- * Returns %TRUE if @to is changed or %FALSE otherwise
+ * Returns: %TRUE if @to is changed or %FALSE otherwise
  **/
 gboolean
 camel_tag_list_copy(CamelTag **to, CamelTag **from)
@@ -3883,7 +3883,7 @@
  * camel_system_flag:
  * @name: name of a system flag
  *
- * Returns the integer value of the system flag string
+ * Returns: the integer value of the system flag string
  **/
 guint32
 camel_system_flag (const char *name)
@@ -3907,7 +3907,7 @@
  * 
  * Find the state of the flag @name in @flags.
  * 
- * Returns %TRUE if the named flag is set or %FALSE otherwise
+ * Returns: %TRUE if the named flag is set or %FALSE otherwise
  **/
 gboolean
 camel_system_flag_get (guint32 flags, const char *name)
@@ -3924,7 +3924,7 @@
  *
  * Create a new #CamelMessageInfo.
  *
- * Returns a new #CamelMessageInfo
+ * Returns: a new #CamelMessageInfo
  **/
 void *
 camel_message_info_new (CamelFolderSummary *s)
@@ -3998,7 +3998,7 @@
  * Create a new #CamelMessageInfo pre-populated with info from
  * @header.
  *
- * Returns a new #CamelMessageInfo
+ * Returns: a new #CamelMessageInfo
  **/
 CamelMessageInfo *
 camel_message_info_new_from_header(CamelFolderSummary *s, struct _camel_header_raw *header)
@@ -4112,7 +4112,7 @@
  *
  * Duplicate a #CamelMessageInfo.
  *
- * Returns the duplicated #CamelMessageInfo
+ * Returns: the duplicated #CamelMessageInfo
  **/
 void *
 camel_message_info_clone(const void *o)
@@ -4200,7 +4200,7 @@
  *
  * Generic accessor method for getting pointer data.
  *
- * Returns the pointer data
+ * Returns: the pointer data
  **/
 const void *
 camel_message_info_ptr(const CamelMessageInfo *mi, int id)
@@ -4219,7 +4219,7 @@
  *
  * Generic accessor method for getting 32bit int data.
  *
- * Returns the int data
+ * Returns: the int data
  **/
 guint32
 camel_message_info_uint32(const CamelMessageInfo *mi, int id)
@@ -4238,7 +4238,7 @@
  *
  * Generic accessor method for getting time_t data.
  *
- * Returns the time_t data
+ * Returns: the time_t data
  **/
 time_t
 camel_message_info_time(const CamelMessageInfo *mi, int id)
@@ -4257,7 +4257,7 @@
  *
  * Get the state of a user flag named @id.
  *
- * Returns the state of the user flag
+ * Returns: the state of the user flag
  **/
 gboolean
 camel_message_info_user_flag(const CamelMessageInfo *mi, const char *id)
@@ -4276,7 +4276,7 @@
  *
  * Get the value of a user tag named @id.
  *
- * Returns the value of the user tag
+ * Returns: the value of the user tag
  **/
 const char *
 camel_message_info_user_tag(const CamelMessageInfo *mi, const char *id)
@@ -4350,7 +4350,7 @@
  *
  * Change the state of the system flags on the #CamelMessageInfo
  *
- * Returns %TRUE if any of the flags changed or %FALSE otherwise
+ * Returns: %TRUE if any of the flags changed or %FALSE otherwise
  **/
 gboolean
 camel_message_info_set_flags(CamelMessageInfo *mi, guint32 flags, guint32 set)
@@ -4393,7 +4393,7 @@
  *
  * Set the state of a user flag on a #CamelMessageInfo.
  *
- * Returns %TRUE if the state changed or %FALSE otherwise
+ * Returns: %TRUE if the state changed or %FALSE otherwise
  **/
 gboolean
 camel_message_info_set_user_flag(CamelMessageInfo *mi, const char *id, gboolean state)
@@ -4435,7 +4435,7 @@
  *
  * Set the value of a user tag on a #CamelMessageInfo.
  *
- * Returns %TRUE if the value changed or %FALSE otherwise
+ * Returns: %TRUE if the value changed or %FALSE otherwise
  **/
 gboolean
 camel_message_info_set_user_tag(CamelMessageInfo *mi, const char *id, const char *val)

Modified: trunk/camel/camel-folder-summary.h
==============================================================================
--- trunk/camel/camel-folder-summary.h	(original)
+++ trunk/camel/camel-folder-summary.h	Wed Jul 23 03:06:32 2008
@@ -235,9 +235,10 @@
 	char *summary_path;
 	gboolean build_content;	/* do we try and parse/index the content, or not? */
 
-	/* Deprecated */
-//	GPtrArray *messages;	/* CamelMessageInfo's */
-//	GHashTable *messages_uid; /* CamelMessageInfo's by uid */
+#if 0  /* Deprecated */
+	GPtrArray *messages;	/* CamelMessageInfo's */
+	GHashTable *messages_uid; /* CamelMessageInfo's by uid */
+#endif
 
 	/* New members to replace the above depreacted members */
 	GPtrArray *uids;
@@ -398,7 +399,7 @@
 
 /* message flag operations */
 gboolean	camel_flag_get(CamelFlag **list, const char *name);
-gboolean	camel_flag_set(CamelFlag **list, const char *name, gboolean state);
+gboolean	camel_flag_set(CamelFlag **list, const char *name, gboolean value);
 gboolean	camel_flag_list_copy(CamelFlag **to, CamelFlag **from);
 int		camel_flag_list_size(CamelFlag **list);
 void		camel_flag_list_free(CamelFlag **list);
@@ -450,7 +451,7 @@
 gboolean camel_message_info_user_flag(const CamelMessageInfo *mi, const char *id);
 const char *camel_message_info_user_tag(const CamelMessageInfo *mi, const char *id);
 
-gboolean camel_message_info_set_flags(CamelMessageInfo *mi, guint32 mask, guint32 set);
+gboolean camel_message_info_set_flags(CamelMessageInfo *mi, guint32 flags, guint32 set);
 gboolean camel_message_info_set_user_flag(CamelMessageInfo *mi, const char *id, gboolean state);
 gboolean camel_message_info_set_user_tag(CamelMessageInfo *mi, const char *id, const char *val);
 

Modified: trunk/camel/camel-folder-thread.h
==============================================================================
--- trunk/camel/camel-folder-thread.h	(original)
+++ trunk/camel/camel-folder-thread.h	Wed Jul 23 03:06:32 2008
@@ -57,8 +57,8 @@
 void camel_folder_thread_messages_remove(CamelFolderThread *thread, GPtrArray *uids);
 #endif
 
-void camel_folder_thread_messages_ref(CamelFolderThread *threads);
-void camel_folder_thread_messages_unref(CamelFolderThread *threads);
+void camel_folder_thread_messages_ref(CamelFolderThread *thread);
+void camel_folder_thread_messages_unref(CamelFolderThread *thread);
 
 /* debugging function only */
 int camel_folder_threaded_messages_dump(CamelFolderThreadNode *c);

Modified: trunk/camel/camel-folder.c
==============================================================================
--- trunk/camel/camel-folder.c	(original)
+++ trunk/camel/camel-folder.c	Wed Jul 23 03:06:32 2008
@@ -528,7 +528,7 @@
  * Get the (short) name of the folder. The fully qualified name
  * can be obtained with the #camel_folder_get_full_name method.
  *
- * Returns the short name of the folder
+ * Returns: the short name of the folder
  **/
 const char *
 camel_folder_get_name (CamelFolder *folder)
@@ -552,7 +552,7 @@
  *
  * Get the full name of the folder.
  *
- * Returns the full name of the folder
+ * Returns: the full name of the folder
  **/
 const char *
 camel_folder_get_full_name (CamelFolder *folder)
@@ -574,7 +574,7 @@
  * camel_folder_get_parent_store:
  * @folder: a #CamelFolder object
  *
- * Returns the parent #CamelStore of the folder
+ * Returns: the parent #CamelStore of the folder
  **/
 CamelStore *
 camel_folder_get_parent_store (CamelFolder *folder)
@@ -626,7 +626,7 @@
  * camel_folder_get_message_count:
  * @folder: a #CamelFolder object
  *
- * Returns the number of messages in the folder, or %-1 if unknown
+ * Returns: the number of messages in the folder, or %-1 if unknown
  **/
 int
 camel_folder_get_message_count (CamelFolder *folder)
@@ -647,7 +647,7 @@
  *
  * DEPRECATED: use #camel_object_get instead.
  *
- * Returns the number of unread messages in the folder, or %-1 if
+ * Returns: the number of unread messages in the folder, or %-1 if
  * unknown
  **/
 int
@@ -667,7 +667,7 @@
  * camel_folder_get_deleted_message_count:
  * @folder: a #CamelFolder object
  *
- * Returns the number of deleted messages in the folder, or %-1 if
+ * Returns: the number of deleted messages in the folder, or %-1 if
  * unknown
  **/
 int
@@ -738,7 +738,7 @@
  * camel_folder_get_permanent_flags:
  * @folder: a #CamelFolder object
  *
- * Returns the set of #CamelMessageFlags that can be permanently
+ * Returns: the set of #CamelMessageFlags that can be permanently
  * stored on a message between sessions. If it includes
  * #CAMEL_FLAG_USER, then user-defined flags will be remembered.
  **/
@@ -776,7 +776,7 @@
  *
  * Deprecated: Use #camel_folder_get_message_info instead.
  *
- * Returns the #CamelMessageFlags that are set on the indicated
+ * Returns: the #CamelMessageFlags that are set on the indicated
  * message.
  **/
 guint32
@@ -827,7 +827,7 @@
  * DEPRECATED: Use #camel_message_info_set_flags on the message info directly
  * (when it works)
  *
- * Returns %TRUE if the flags were changed or %FALSE otherwise
+ * Returns: %TRUE if the flags were changed or %FALSE otherwise
  **/
 gboolean
 camel_folder_set_message_flags(CamelFolder *folder, const char *uid, guint32 flags, guint32 set)
@@ -870,7 +870,7 @@
  * DEPRECATED: Use #camel_message_info_get_user_flag on the message
  * info directly
  *
- * Returns %TRUE if the given user flag is set on the message or
+ * Returns: %TRUE if the given user flag is set on the message or
  * %FALSE otherwise
  **/
 gboolean
@@ -953,7 +953,7 @@
  * DEPRECATED: Use #camel_message_info_get_user_tag on the
  * #CamelMessageInfo directly.
  *
- * Returns the value of the user tag
+ * Returns: the value of the user tag
  **/
 const char *
 camel_folder_get_message_user_tag (CamelFolder *folder, const char *uid,  const char *name)
@@ -1023,7 +1023,7 @@
  * Retrieve the #CamelMessageInfo for the specified @uid.  This return
  * must be freed using #camel_folder_free_message_info.
  *
- * Returns the summary information for the indicated message, or %NULL
+ * Returns: the summary information for the indicated message, or %NULL
  * if the uid does not exist
  **/
 CamelMessageInfo *
@@ -1101,7 +1101,7 @@
  *
  * Get whether or not the folder has a summary.
  *
- * Returns %TRUE if a summary is available or %FALSE otherwise
+ * Returns: %TRUE if a summary is available or %FALSE otherwise
  **/
 gboolean
 camel_folder_has_summary_capability (CamelFolder *folder)
@@ -1132,7 +1132,7 @@
  *
  * Get a message from its UID in the folder.
  *
- * Returns a #CamelMimeMessage corresponding to @uid
+ * Returns: a #CamelMimeMessage corresponding to @uid
  **/
 CamelMimeMessage *
 camel_folder_get_message (CamelFolder *folder, const char *uid, CamelException *ex)
@@ -1192,7 +1192,7 @@
  * support summaries. The returned array should not be modified, and
  * must be freed by passing it to #camel_folder_free_uids.
  *
- * Returns a GPtrArray of UIDs corresponding to the messages available
+ * Returns: a GPtrArray of UIDs corresponding to the messages available
  * in the folder
  **/
 GPtrArray *
@@ -1290,7 +1290,7 @@
  * should not be modified, and must be freed with
  * #camel_folder_free_summary.
  *
- * Returns an array of #CamelMessageInfo
+ * Returns: an array of #CamelMessageInfo
  **/
 GPtrArray *
 camel_folder_get_summary (CamelFolder *folder)
@@ -1332,7 +1332,7 @@
  *
  * Checks if a folder supports searching.
  *
- * Returns %TRUE if the folder supports searching or %FALSE otherwise
+ * Returns: %TRUE if the folder supports searching or %FALSE otherwise
  **/
 gboolean
 camel_folder_has_search_capability (CamelFolder *folder)
@@ -1365,7 +1365,7 @@
  *
  * Searches the folder for messages matching the given search expression.
  *
- * Returns a #GPtrArray of uids of matching messages. The caller must
+ * Returns: a #GPtrArray of uids of matching messages. The caller must
  * free the list and each of the elements when it is done.
  **/
 GPtrArray *
@@ -1407,7 +1407,7 @@
  *
  * Search a subset of uid's for an expression match.
  *
- * Returns a #GPtrArray of uids of matching messages. The caller must
+ * Returns: a #GPtrArray of uids of matching messages. The caller must
  * free the list and each of the elements when it is done.
  **/
 GPtrArray *
@@ -1725,7 +1725,7 @@
  * camel_folder_is_frozen:
  * @folder: a #CamelFolder object
  *
- * Returns whether or not the folder is frozen
+ * Returns: whether or not the folder is frozen
  **/
 gboolean
 camel_folder_is_frozen (CamelFolder *folder)
@@ -1745,7 +1745,7 @@
  * camel_folder_get_quota_info:
  * @folder: a #CamelFolder object
  *
- * Returns list of known quota(s) for the folder.
+ * Returns: list of known quota(s) for the folder.
  **/
 CamelFolderQuotaInfo *
 camel_folder_get_quota_info (CamelFolder *folder)
@@ -1761,8 +1761,8 @@
  * @used: Current usage of the quota.
  * @total: Total available size of the quota.
  *
- * Returns newly allocated #CamelFolderQuotaInfo structure with initialized values
- * based on the parameters, with next member set to NULL.
+ * Returns: newly allocated #CamelFolderQuotaInfo structure with
+ * initialized values based on the parameters, with next member set to NULL.
  **/
 CamelFolderQuotaInfo *
 camel_folder_quota_info_new (const char *name, guint64 used, guint64 total)
@@ -2116,7 +2116,7 @@
  * Change info structures are not MT-SAFE and must be
  * locked for exclusive access externally.
  *
- * Returns a new #CamelFolderChangeInfo
+ * Returns: a new #CamelFolderChangeInfo
  **/
 CamelFolderChangeInfo *
 camel_folder_change_info_new(void)
@@ -2473,7 +2473,7 @@
  *
  * Gets whether or not there have been any changes.
  *
- * Returns %TRUE if the changeset contains any changes or %FALSE
+ * Returns: %TRUE if the changeset contains any changes or %FALSE
  * otherwise
  **/
 gboolean

Modified: trunk/camel/camel-gpg-context.c
==============================================================================
--- trunk/camel/camel-gpg-context.c	(original)
+++ trunk/camel/camel-gpg-context.c	Wed Jul 23 03:06:32 2008
@@ -80,7 +80,7 @@
  *
  * Creates a new gpg cipher context object.
  *
- * Returns a new gpg cipher context object.
+ * Returns: a new gpg cipher context object.
  **/
 CamelCipherContext *
 camel_gpg_context_new (CamelSession *session)

Modified: trunk/camel/camel-internet-address.c
==============================================================================
--- trunk/camel/camel-internet-address.c	(original)
+++ trunk/camel/camel-internet-address.c	Wed Jul 23 03:06:32 2008
@@ -274,7 +274,7 @@
  *
  * Create a new #CamelInternetAddress object.
  * 
- * Returns a new #CamelInternetAddress object
+ * Returns: a new #CamelInternetAddress object
  **/
 CamelInternetAddress *
 camel_internet_address_new (void)
@@ -292,7 +292,7 @@
  * 
  * Add a new internet address to @addr.
  * 
- * Returns the index of added entry
+ * Returns: the index of added entry
  **/
 int
 camel_internet_address_add (CamelInternetAddress *addr, const char *name, const char *address)
@@ -321,7 +321,7 @@
  * 
  * Get the address at @index.
  * 
- * Returns %TRUE if such an address exists, or %FALSE otherwise
+ * Returns: %TRUE if such an address exists, or %FALSE otherwise
  **/
 gboolean
 camel_internet_address_get (const CamelInternetAddress *addr, int index, const char **namep, const char **addressp)
@@ -350,7 +350,7 @@
  * 
  * Find address by real name.
  * 
- * Returns the index of the address matching the name, or %-1 if no
+ * Returns: the index of the address matching the name, or %-1 if no
  * match was found
  **/
 int
@@ -382,7 +382,7 @@
  * 
  * Find an address by address.
  * 
- * Returns the index of the address, or %-1 if not found
+ * Returns: the index of the address, or %-1 if not found
  **/
 int
 camel_internet_address_find_address(CamelInternetAddress *addr, const char *address, const char **namep)
@@ -454,7 +454,7 @@
  *
  * Note: The value at * in will be updated based on any linewrapping done
  * 
- * Returns the encoded address
+ * Returns: the encoded address
  **/
 char *
 camel_internet_address_encode_address(int *inlen, const char *real, const char *addr)
@@ -525,7 +525,7 @@
  * 
  * Function to format a single address, suitable for display.
  * 
- * Returns a nicely formatted string containing the rfc822 address
+ * Returns: a nicely formatted string containing the rfc822 address
  **/
 char *
 camel_internet_address_format_address(const char *name, const char *addr)

Modified: trunk/camel/camel-internet-address.h
==============================================================================
--- trunk/camel/camel-internet-address.h	(original)
+++ trunk/camel/camel-internet-address.h	Wed Jul 23 03:06:32 2008
@@ -53,7 +53,7 @@
 
 /* utility functions, for network/display formatting */
 char *			camel_internet_address_encode_address(int *len, const char *name, const char *addr);
-char *			camel_internet_address_format_address(const char *real, const char *addr);
+char *			camel_internet_address_format_address(const char *name, const char *addr);
 
 G_END_DECLS
 

Modified: trunk/camel/camel-medium.c
==============================================================================
--- trunk/camel/camel-medium.c	(original)
+++ trunk/camel/camel-medium.c	Wed Jul 23 03:06:32 2008
@@ -219,7 +219,7 @@
  * instance of the header.  For multi-occuring headers, use
  * :get_headers().
  *
- * Returns the value of the named header, or %NULL
+ * Returns: the value of the named header, or %NULL
  **/
 const void *
 camel_medium_get_header(CamelMedium *medium, const char *name)
@@ -247,7 +247,7 @@
  * to UTF-8 for any headers that are recognized by Camel. The
  * caller should not modify the returned data.
  *
- * Returns the array of headers, which must be freed with
+ * Returns: the array of headers, which must be freed with
  * #camel_medium_free_headers.
  **/
 GArray *
@@ -295,7 +295,7 @@
  * Getss a data wrapper that represents the content of the medium,
  * without its headers.
  *
- * Returns a #CamelDataWrapper containing @medium's content
+ * Returns: a #CamelDataWrapper containing @medium's content
  **/
 CamelDataWrapper *
 camel_medium_get_content_object (CamelMedium *medium)

Modified: trunk/camel/camel-mime-filter-basic.c
==============================================================================
--- trunk/camel/camel-mime-filter-basic.c	(original)
+++ trunk/camel/camel-mime-filter-basic.c	Wed Jul 23 03:06:32 2008
@@ -259,7 +259,7 @@
  *
  * Create a new #CamelMimeFilterBasic object.
  * 
- * Returns a new #CamelMimeFilterBasic object
+ * Returns: a new #CamelMimeFilterBasic object
  **/
 CamelMimeFilterBasic *
 camel_mime_filter_basic_new (void)
@@ -275,7 +275,7 @@
  *
  * Create a new #CamelMimeFilterBasic object of type @type.
  * 
- * Returns a new #CamelMimeFilterBasic object
+ * Returns: a new #CamelMimeFilterBasic object
  **/
 CamelMimeFilterBasic *
 camel_mime_filter_basic_new_type(CamelMimeFilterBasicType type)

Modified: trunk/camel/camel-mime-filter-bestenc.c
==============================================================================
--- trunk/camel/camel-mime-filter-bestenc.c	(original)
+++ trunk/camel/camel-mime-filter-bestenc.c	Wed Jul 23 03:06:32 2008
@@ -199,7 +199,7 @@
  *
  * Create a new #CamelMimeFilterBestenc object. 
  * 
- * Returns a new #CamelMimeFilterBestenc object
+ * Returns: a new #CamelMimeFilterBestenc object
  **/
 CamelMimeFilterBestenc *
 camel_mime_filter_bestenc_new (unsigned int flags)
@@ -218,7 +218,7 @@
  * Get the best encoding, given specific constraints, that can be used to
  * encode a stream of bytes.
  * 
- * Returns the best encoding to use
+ * Returns: the best encoding to use
  **/
 CamelTransferEncoding
 camel_mime_filter_bestenc_get_best_encoding(CamelMimeFilterBestenc *filter, CamelBestencEncoding required)
@@ -279,7 +279,7 @@
  * 
  * Gets the best charset that can be used to contain this content.
  * 
- * Returns the name of the best charset to use to encode the input
+ * Returns: the name of the best charset to use to encode the input
  * text filtered by @filter
  **/
 const char *

Modified: trunk/camel/camel-mime-filter-canon.c
==============================================================================
--- trunk/camel/camel-mime-filter-canon.c	(original)
+++ trunk/camel/camel-mime-filter-canon.c	Wed Jul 23 03:06:32 2008
@@ -186,7 +186,7 @@
  *
  * Create a new filter to canonicalise an input stream.
  *
- * Returns a new #CamelMimeFilterCanon
+ * Returns: a new #CamelMimeFilterCanon
  **/
 CamelMimeFilter *
 camel_mime_filter_canon_new(guint32 flags)

Modified: trunk/camel/camel-mime-filter-charset.c
==============================================================================
--- trunk/camel/camel-mime-filter-charset.c	(original)
+++ trunk/camel/camel-mime-filter-charset.c	Wed Jul 23 03:06:32 2008
@@ -246,7 +246,7 @@
  *
  * Create a new #CamelMimeFilterCharset object.
  * 
- * Returns a new #CamelMimeFilterCharset object
+ * Returns: a new #CamelMimeFilterCharset object
  **/
 CamelMimeFilterCharset *
 camel_mime_filter_charset_new (void)
@@ -263,7 +263,7 @@
  * Create a new #CamelMimeFiletrCharset object to convert text from
  * @from_charset to @to_charset.
  *
- * Returns a new #CamelMimeFilterCharset object
+ * Returns: a new #CamelMimeFilterCharset object
  **/
 CamelMimeFilterCharset *
 camel_mime_filter_charset_new_convert (const char *from_charset, const char *to_charset)

Modified: trunk/camel/camel-mime-filter-crlf.c
==============================================================================
--- trunk/camel/camel-mime-filter-crlf.c	(original)
+++ trunk/camel/camel-mime-filter-crlf.c	Wed Jul 23 03:06:32 2008
@@ -169,7 +169,7 @@
  *
  * Create a new #CamelMimeFiletrCRLF object.
  *
- * Returns a new #CamelMimeFilterCRLF object
+ * Returns: a new #CamelMimeFilterCRLF object
  **/
 CamelMimeFilter *
 camel_mime_filter_crlf_new (CamelMimeFilterCRLFDirection direction, CamelMimeFilterCRLFMode mode)

Modified: trunk/camel/camel-mime-filter-enriched.c
==============================================================================
--- trunk/camel/camel-mime-filter-enriched.c	(original)
+++ trunk/camel/camel-mime-filter-enriched.c	Wed Jul 23 03:06:32 2008
@@ -570,7 +570,7 @@
  * Create a new #CamelMimeFilterEnriched object to convert input text
  * streams from text/plain into text/enriched or text/richtext.
  *
- * Returns a new #CamelMimeFilterEnriched object
+ * Returns: a new #CamelMimeFilterEnriched object
  **/
 CamelMimeFilter *
 camel_mime_filter_enriched_new (guint32 flags)
@@ -592,7 +592,7 @@
  * Convert @in from text/plain into text/enriched or text/richtext
  * based on @flags.
  *
- * Returns a newly allocated string containing the enriched or
+ * Returns: a newly allocated string containing the enriched or
  * richtext version of @in.
  **/
 char *

Modified: trunk/camel/camel-mime-filter-from.c
==============================================================================
--- trunk/camel/camel-mime-filter-from.c	(original)
+++ trunk/camel/camel-mime-filter-from.c	Wed Jul 23 03:06:32 2008
@@ -175,7 +175,7 @@
  *
  * Create a new #CamelMimeFilterFrom object.
  * 
- * Returns a new #CamelMimeFilterFrom object
+ * Returns: a new #CamelMimeFilterFrom object
  **/
 CamelMimeFilterFrom *
 camel_mime_filter_from_new (void)

Modified: trunk/camel/camel-mime-filter-gzip.c
==============================================================================
--- trunk/camel/camel-mime-filter-gzip.c	(original)
+++ trunk/camel/camel-mime-filter-gzip.c	Wed Jul 23 03:06:32 2008
@@ -440,7 +440,7 @@
  *
  * Creates a new gzip (or gunzip) filter.
  *
- * Returns a new gzip (or gunzip) filter.
+ * Returns: a new gzip (or gunzip) filter.
  **/
 CamelMimeFilter *
 camel_mime_filter_gzip_new (CamelMimeFilterGZipMode mode, int level)

Modified: trunk/camel/camel-mime-filter-html.c
==============================================================================
--- trunk/camel/camel-mime-filter-html.c	(original)
+++ trunk/camel/camel-mime-filter-html.c	Wed Jul 23 03:06:32 2008
@@ -190,7 +190,7 @@
  *
  * Create a new #CamelMimeFilterHTML object.
  * 
- * Returns a new #CamelMimeFilterHTML object
+ * Returns: a new #CamelMimeFilterHTML object
  **/
 CamelMimeFilterHTML *
 camel_mime_filter_html_new (void)

Modified: trunk/camel/camel-mime-filter-index.c
==============================================================================
--- trunk/camel/camel-mime-filter-index.c	(original)
+++ trunk/camel/camel-mime-filter-index.c	Wed Jul 23 03:06:32 2008
@@ -106,7 +106,7 @@
  *
  * Create a new #CamelMimeFilterIndex object
  * 
- * Returns a new #CamelMimeFilterIndex object
+ * Returns: a new #CamelMimeFilterIndex object
  **/
 CamelMimeFilterIndex *
 camel_mime_filter_index_new (void)
@@ -122,7 +122,7 @@
  *
  * Create a new #CamelMimeFilterIndex based on @index.
  *
- * Returns a new #CamelMimeFilterIndex object
+ * Returns: a new #CamelMimeFilterIndex object
  **/
 CamelMimeFilterIndex *
 camel_mime_filter_index_new_index (CamelIndex *index)

Modified: trunk/camel/camel-mime-filter-progress.c
==============================================================================
--- trunk/camel/camel-mime-filter-progress.c	(original)
+++ trunk/camel/camel-mime-filter-progress.c	Wed Jul 23 03:06:32 2008
@@ -129,7 +129,7 @@
  * Create a new #CamelMimeFilterProgress object that will report
  * streaming progress.
  *
- * Returns a new #CamelMimeFilter object
+ * Returns: a new #CamelMimeFilter object
  **/
 CamelMimeFilter *
 camel_mime_filter_progress_new (CamelOperation *operation, size_t total)

Modified: trunk/camel/camel-mime-filter-save.c
==============================================================================
--- trunk/camel/camel-mime-filter-save.c	(original)
+++ trunk/camel/camel-mime-filter-save.c	Wed Jul 23 03:06:32 2008
@@ -99,7 +99,7 @@
  *
  * Create a new #CamelMimeFilterSave filter object.
  *
- * Returns a new #CamelMimeFilterSave object
+ * Returns: a new #CamelMimeFilterSave object
  **/
 CamelMimeFilter *
 camel_mime_filter_save_new (void)
@@ -119,7 +119,7 @@
  * Create a new #CamelMimeFilterSave filter object that will save a
  * copy of all filtered data to @stream.
  *
- * Returns a new #CamelMimeFilterSave object
+ * Returns: a new #CamelMimeFilterSave object
  **/
 CamelMimeFilter *
 camel_mime_filter_save_new_with_stream (CamelStream *stream)

Modified: trunk/camel/camel-mime-filter-tohtml.c
==============================================================================
--- trunk/camel/camel-mime-filter-tohtml.c	(original)
+++ trunk/camel/camel-mime-filter-tohtml.c	Wed Jul 23 03:06:32 2008
@@ -429,7 +429,7 @@
  * Create a new #CamelMimeFilterToHTML object to convert plain text
  * into HTML.
  *
- * Returns a new #CamelMimeFilterToHTML object
+ * Returns: a new #CamelMimeFilterToHTML object
  **/
 CamelMimeFilter *
 camel_mime_filter_tohtml_new (guint32 flags, guint32 colour)
@@ -459,7 +459,7 @@
  *
  * Convert @in from plain text into HTML.
  *
- * Returns a newly allocated string containing the HTMLified version
+ * Returns: a newly allocated string containing the HTMLified version
  * of @in
  **/
 char *

Modified: trunk/camel/camel-mime-filter-windows.c
==============================================================================
--- trunk/camel/camel-mime-filter-windows.c	(original)
+++ trunk/camel/camel-mime-filter-windows.c	Wed Jul 23 03:06:32 2008
@@ -141,7 +141,7 @@
  * Create a new #CamelMimeFilterWindows object that will analyse
  * whether or not the text is really encoded in @claimed_charset.
  *
- * Returns a new #CamelMimeFilter object
+ * Returns: a new #CamelMimeFilter object
  **/
 CamelMimeFilter *
 camel_mime_filter_windows_new (const char *claimed_charset)
@@ -166,7 +166,7 @@
  * really in a Microsoft Windows charset rather than the claimed ISO
  * charset.
  *
- * Returns %TRUE if the text was found to be in a Microsoft Windows
+ * Returns: %TRUE if the text was found to be in a Microsoft Windows
  * CP125x charset or %FALSE otherwise.
  **/
 gboolean
@@ -187,7 +187,7 @@
  * claimed_charset passed in at creation time or the Windows-CP125x
  * equivalent).
  *
- * Returns the name of the actual charset
+ * Returns: the name of the actual charset
  **/
 const char *
 camel_mime_filter_windows_real_charset (CamelMimeFilterWindows *filter)

Modified: trunk/camel/camel-mime-filter-yenc.c
==============================================================================
--- trunk/camel/camel-mime-filter-yenc.c	(original)
+++ trunk/camel/camel-mime-filter-yenc.c	Wed Jul 23 03:06:32 2008
@@ -237,7 +237,7 @@
  *
  * Create a new #CamelMimeFilterYenc filter object.
  *
- * Returns a new #CamelMimeFilterYenc object
+ * Returns: a new #CamelMimeFilterYenc object
  **/
 CamelMimeFilter *
 camel_mime_filter_yenc_new (CamelMimeFilterYencDirection direction)
@@ -302,7 +302,7 @@
  *
  * Gets the part id of the current decoded yEnc stream or %-1 on fail.
  *
- * Returns the part id of the current decoded yEnc stream or %-1 on
+ * Returns: the part id of the current decoded yEnc stream or %-1 on
  * fail.
  **/
 int
@@ -323,7 +323,7 @@
  *
  * Get the computed part crc or (#guint32) %-1 on fail.
  *
- * Returns the computed part crc or (#guint32) %-1 on fail.
+ * Returns: the computed part crc or (#guint32) %-1 on fail.
  **/
 guint32
 camel_mime_filter_yenc_get_pcrc (CamelMimeFilterYenc *yenc)
@@ -340,7 +340,7 @@
  *
  * Get the computed crc or (#guint32) -1 on fail.
  *
- * Returns the computed crc or (#guint32) -1 on fail.
+ * Returns: the computed crc or (#guint32) -1 on fail.
  **/
 guint32
 camel_mime_filter_yenc_get_crc (CamelMimeFilterYenc *yenc)
@@ -410,7 +410,7 @@
  * combined crc32 value of all the parts using #CAMEL_MIME_YENCODE_CRC_FINAL
  * (@crc).
  *
- * Returns the number of bytes decoded
+ * Returns: the number of bytes decoded
  **/
 size_t
 camel_ydecode_step (const unsigned char *in, size_t inlen, unsigned char *out,
@@ -490,7 +490,7 @@
  * Along the same lines, @pcrc and @crc should be initialized to
  * #CAMEL_MIME_YENCODE_CRC_INIT before using.
  *
- * Returns the number of bytes encoded
+ * Returns: the number of bytes encoded
  **/
 size_t
 camel_yencode_step (const unsigned char *in, size_t inlen, unsigned char *out,
@@ -555,7 +555,7 @@
  * #CAMEL_MIME_YENCODE_CRC_FINAL (@crc) to get the combined crc32 value of
  * all the parts.
  *
- * Returns the number of bytes encoded.
+ * Returns: the number of bytes encoded.
  **/
 size_t
 camel_yencode_close (const unsigned char *in, size_t inlen, unsigned char *out,

Modified: trunk/camel/camel-mime-filter.c
==============================================================================
--- trunk/camel/camel-mime-filter.c	(original)
+++ trunk/camel/camel-mime-filter.c	Wed Jul 23 03:06:32 2008
@@ -109,7 +109,7 @@
  *
  * Create a new #CamelMimeFilter object.
  * 
- * Returns a new #CamelMimeFilter
+ * Returns: a new #CamelMimeFilter
  **/
 CamelMimeFilter *
 camel_mime_filter_new (void)

Modified: trunk/camel/camel-mime-message.c
==============================================================================
--- trunk/camel/camel-mime-message.c	(original)
+++ trunk/camel/camel-mime-message.c	Wed Jul 23 03:06:32 2008
@@ -195,7 +195,7 @@
  *
  * Create a new #CamelMimeMessage object.
  *
- * Returns a new #CamelMimeMessage object
+ * Returns: a new #CamelMimeMessage object
  **/
 CamelMimeMessage *
 camel_mime_message_new (void) 
@@ -248,7 +248,7 @@
  *
  * Get the date and GMT offset of a message.
  *
- * Returns the date of the message
+ * Returns: the date of the message
  **/
 time_t
 camel_mime_message_get_date (CamelMimeMessage *msg, int *offset)
@@ -267,7 +267,7 @@
  *
  * Get the received date and GMT offset of a message.
  *
- * Returns the received date of the message
+ * Returns: the received date of the message
  **/
 time_t
 camel_mime_message_get_date_received (CamelMimeMessage *msg, int *offset)
@@ -325,7 +325,7 @@
  *
  * Get the message-id of a message.
  *
- * Returns the message-id of a message
+ * Returns: the message-id of a message
  **/
 const char *
 camel_mime_message_get_message_id (CamelMimeMessage *mime_message)
@@ -375,7 +375,7 @@
  *
  * Get the Reply-To of a message.
  *
- * Returns the Reply-Toa ddress of the message
+ * Returns: the Reply-Toa ddress of the message
  **/
 const CamelInternetAddress *
 camel_mime_message_get_reply_to (CamelMimeMessage *mime_message)
@@ -424,7 +424,7 @@
  *
  * Get the UTF-8 subject text of a message.
  *
- * Returns the message subject
+ * Returns: the message subject
  **/
 const char *
 camel_mime_message_get_subject (CamelMimeMessage *mime_message)
@@ -477,7 +477,7 @@
  *
  * Get the from address of a message.
  *
- * Returns the from address of the message
+ * Returns: the from address of the message
  **/
 const CamelInternetAddress *
 camel_mime_message_get_from (CamelMimeMessage *mime_message)
@@ -536,7 +536,7 @@
  *
  * Get the message recipients of a specified type.
  *
- * Returns the requested recipients
+ * Returns: the requested recipients
  **/
 const CamelInternetAddress *
 camel_mime_message_get_recipients (CamelMimeMessage *mime_message, const char *type)
@@ -822,7 +822,7 @@
  *
  * Find out if a message contains 8bit or binary encoded parts.
  *
- * Returns %TRUE if the message contains 8bit parts or %FALSE otherwise
+ * Returns: %TRUE if the message contains 8bit parts or %FALSE otherwise
  **/
 gboolean
 camel_mime_message_has_8bit_parts (CamelMimeMessage *msg)
@@ -1075,7 +1075,7 @@
  *
  * Get a MIME part by id from a message.
  *
- * Returns the MIME part with the requested id or %NULL if not found
+ * Returns: the MIME part with the requested id or %NULL if not found
  **/
 CamelMimePart *
 camel_mime_message_get_part_by_content_id (CamelMimeMessage *message, const char *id)
@@ -1111,7 +1111,7 @@
  *
  * Build an MBox from-line from @message.
  *
- * Returns an MBox from-line suitable for use in an mbox file
+ * Returns: an MBox from-line suitable for use in an mbox file
  **/
 char *
 camel_mime_message_build_mbox_from (CamelMimeMessage *message)

Modified: trunk/camel/camel-mime-parser.h
==============================================================================
--- trunk/camel/camel-mime-parser.h	(original)
+++ trunk/camel/camel-mime-parser.h	Wed Jul 23 03:06:32 2008
@@ -83,8 +83,8 @@
 int		camel_mime_parser_errno (CamelMimeParser *parser);
 
 /* using an fd will be a little faster, but not much (over a simple stream) */
-int		camel_mime_parser_init_with_fd (CamelMimeParser *parser, int fd);
-int		camel_mime_parser_init_with_stream (CamelMimeParser *parser, CamelStream *stream);
+int		camel_mime_parser_init_with_fd (CamelMimeParser *m, int fd);
+int		camel_mime_parser_init_with_stream (CamelMimeParser *m, CamelStream *stream);
 
 /* get the stream or fd back of the parser */
 CamelStream    *camel_mime_parser_stream (CamelMimeParser *parser);
@@ -99,7 +99,7 @@
 int camel_mime_parser_set_header_regex (CamelMimeParser *parser, char *matchstr);
 
 /* normal interface */
-camel_mime_parser_state_t camel_mime_parser_step (CamelMimeParser *parser, char **buf, size_t *buflen);
+camel_mime_parser_state_t camel_mime_parser_step (CamelMimeParser *parser, char **databuffer, size_t *datalength);
 void camel_mime_parser_unstep (CamelMimeParser *parser);
 void camel_mime_parser_drop_step (CamelMimeParser *parser);
 camel_mime_parser_state_t camel_mime_parser_state (CamelMimeParser *parser);
@@ -112,21 +112,21 @@
 CamelContentType *camel_mime_parser_content_type (CamelMimeParser *parser);
 
 /* get/change raw header by name */
-const char *camel_mime_parser_header (CamelMimeParser *parser, const char *name, int *offset);
+const char *camel_mime_parser_header (CamelMimeParser *m, const char *name, int *offset);
 
 /* get all raw headers. READ ONLY! */
-struct _camel_header_raw *camel_mime_parser_headers_raw (CamelMimeParser *parser);
+struct _camel_header_raw *camel_mime_parser_headers_raw (CamelMimeParser *m);
 
 /* get multipart pre/postface */
-const char *camel_mime_parser_preface (CamelMimeParser *parser);
-const char *camel_mime_parser_postface (CamelMimeParser *parser);
+const char *camel_mime_parser_preface (CamelMimeParser *m);
+const char *camel_mime_parser_postface (CamelMimeParser *m);
 
 /* return the from line content */
-const char *camel_mime_parser_from_line (CamelMimeParser *parser);
+const char *camel_mime_parser_from_line (CamelMimeParser *m);
 
 /* add a processing filter for body contents */
-int camel_mime_parser_filter_add (CamelMimeParser *parser, CamelMimeFilter *filter);
-void camel_mime_parser_filter_remove (CamelMimeParser *parser, int id);
+int camel_mime_parser_filter_add (CamelMimeParser *m, CamelMimeFilter *mf);
+void camel_mime_parser_filter_remove (CamelMimeParser *m, int id);
 
 /* these should be used with caution, because the state will not
    track the seeked position */

Modified: trunk/camel/camel-mime-part.c
==============================================================================
--- trunk/camel/camel-mime-part.c	(original)
+++ trunk/camel/camel-mime-part.c	Wed Jul 23 03:06:32 2008
@@ -355,7 +355,7 @@
  *
  * Get the description of the MIME part.
  *
- * Returns the description
+ * Returns: the description
  **/
 const char *
 camel_mime_part_get_description (CamelMimePart *mime_part)
@@ -411,7 +411,7 @@
  *
  * Get the disposition of the MIME part.
  *
- * Returns the dispisition
+ * Returns: the dispisition
  **/
 const char *
 camel_mime_part_get_disposition (CamelMimePart *mime_part)
@@ -460,7 +460,7 @@
  *
  * Get the filename of a MIME part.
  *
- * Returns the filename of the MIME part
+ * Returns: the filename of the MIME part
  **/
 const char *
 camel_mime_part_get_filename (CamelMimePart *mime_part)
@@ -507,7 +507,7 @@
  *
  * Get the content-id field of a MIME part.
  *
- * Returns the content-id field of the MIME part
+ * Returns: the content-id field of the MIME part
  **/
 const char *
 camel_mime_part_get_content_id (CamelMimePart *mime_part)
@@ -537,7 +537,7 @@
  *
  * Get the content-md5 field of the MIME part.
  *
- * Returns the content-md5 field of the MIME part
+ * Returns: the content-md5 field of the MIME part
  **/
 const char *
 camel_mime_part_get_content_MD5 (CamelMimePart *mime_part)
@@ -569,7 +569,7 @@
  *
  * Get the content-location field of a MIME part.
  *
- * Returns the content-location field of a MIME part
+ * Returns: the content-location field of a MIME part
  **/
 const char *
 camel_mime_part_get_content_location (CamelMimePart *mime_part)
@@ -605,7 +605,7 @@
  *
  * Get the Content-Transfer-Encoding of a MIME part.
  *
- * Returns a #CamelTransferEncoding
+ * Returns: a #CamelTransferEncoding
  **/
 CamelTransferEncoding
 camel_mime_part_get_encoding (CamelMimePart *mime_part)
@@ -641,7 +641,7 @@
  *
  * Get the Content-Languages set on the MIME part.
  *
- * Returns a #GList of languages
+ * Returns: a #GList of languages
  **/
 const GList *
 camel_mime_part_get_content_languages (CamelMimePart *mime_part)
@@ -675,7 +675,7 @@
  *
  * Get the Content-Type of a MIME part.
  *
- * Returns the parsed #CamelContentType of the MIME part
+ * Returns: the parsed #CamelContentType of the MIME part
  **/
 CamelContentType *
 camel_mime_part_get_content_type (CamelMimePart *mime_part)
@@ -981,7 +981,7 @@
  *
  * Constructs a MIME part from a parser.
  * 
- * Returns %0 on success or %-1 on fail
+ * Returns: %0 on success or %-1 on fail
  **/
 int
 camel_mime_part_construct_from_parser(CamelMimePart *mime_part, CamelMimeParser *mp)
@@ -1016,7 +1016,7 @@
  *
  * Create a new MIME part.
  *
- * Returns a new #CamelMimePart object
+ * Returns: a new #CamelMimePart object
  **/
 CamelMimePart *
 camel_mime_part_new (void)
@@ -1067,7 +1067,7 @@
  *
  * Get the decoded size of the MIME part's content.
  *
- * Returns the size of the MIME part's content in bytes.
+ * Returns: the size of the MIME part's content in bytes.
  **/
 size_t
 camel_mime_part_get_content_size (CamelMimePart *mime_part)

Modified: trunk/camel/camel-mime-part.h
==============================================================================
--- trunk/camel/camel-mime-part.h	(original)
+++ trunk/camel/camel-mime-part.h	Wed Jul 23 03:06:32 2008
@@ -101,7 +101,7 @@
 
 /* utility functions */
 void      	camel_mime_part_set_content 	       (CamelMimePart *mime_part,
-							const char *content, int length, const char *type);
+							const char *data, int length, const char *type);
 
 size_t          camel_mime_part_get_content_size       (CamelMimePart *mime_part);
 

Modified: trunk/camel/camel-mime-utils.c
==============================================================================
--- trunk/camel/camel-mime-utils.c	(original)
+++ trunk/camel/camel-mime-utils.c	Wed Jul 23 03:06:32 2008
@@ -99,7 +99,7 @@
  * when finished encoding data with #camel_base64_encode_step
  * to flush off the last little bit.
  *
- * Returns the number of bytes encoded
+ * Returns: the number of bytes encoded
  **/
 size_t
 camel_base64_encode_close(unsigned char *in, size_t inlen, gboolean break_lines, unsigned char *out, int *state, int *save)
@@ -129,7 +129,7 @@
  * left-over state in state and save (initialise to 0 on first
  * invocation).
  *
- * Returns the number of bytes encoded
+ * Returns: the number of bytes encoded
  **/
 size_t
 camel_base64_encode_step(unsigned char *in, size_t len, gboolean break_lines, unsigned char *out, int *state, int *save)
@@ -148,7 +148,7 @@
  *
  * Decodes a chunk of base64 encoded data
  *
- * Returns the number of bytes decoded (which have been dumped in @out)
+ * Returns: the number of bytes decoded (which have been dumped in @out)
  **/
 size_t
 camel_base64_decode_step(unsigned char *in, size_t len, unsigned char *out, int *state, unsigned int *save)
@@ -164,7 +164,7 @@
  *
  * Base64 encodes a block of memory.
  *
- * Returns a string containing the base64 encoded data
+ * Returns: a string containing the base64 encoded data
  **/
 char *
 camel_base64_encode_simple (const char *data, size_t len)
@@ -180,7 +180,7 @@
  *
  * Base64 decodes @data inline (overwrites @data with the decoded version).
  *
- * Returns the new length of @data
+ * Returns: the new length of @data
  **/
 size_t
 camel_base64_decode_simple (char *data, size_t len)
@@ -212,7 +212,7 @@
  * Uuencodes a chunk of data. Call this when finished encoding data
  * with #camel_uuencode_step to flush off the last little bit.
  *
- * Returns the number of bytes encoded
+ * Returns: the number of bytes encoded
  **/
 size_t
 camel_uuencode_close (unsigned char *in, size_t len, unsigned char *out, unsigned char *uubuf, int *state, guint32 *save)
@@ -294,7 +294,7 @@
  * state in @uubuf, @state and @save (initialize to 0 on first
  * invocation).
  *
- * Returns the number of bytes encoded
+ * Returns: the number of bytes encoded
  **/
 size_t
 camel_uuencode_step (unsigned char *in, size_t len, unsigned char *out, unsigned char *uubuf, int *state, guint32 *save)
@@ -370,7 +370,7 @@
  * uuencoded data. Assumes the "begin mode filename" line has
  * been stripped off.
  *
- * Returns the number of bytes decoded
+ * Returns: the number of bytes decoded
  **/
 size_t
 camel_uudecode_step (unsigned char *in, size_t len, unsigned char *out, int *state, guint32 *save)
@@ -469,7 +469,7 @@
  * encoding data with #camel_quoted_encode_step to flush off
  * the last little bit.
  *
- * Returns the number of bytes encoded
+ * Returns: the number of bytes encoded
  **/
 size_t
 camel_quoted_encode_close(unsigned char *in, size_t len, unsigned char *out, int *state, int *save)
@@ -512,7 +512,7 @@
  * step', saves left-over state in state and save (initialise to -1 on
  * first invocation).
  *
- * Returns the number of bytes encoded
+ * Returns: the number of bytes encoded
  **/
 size_t
 camel_quoted_encode_step (unsigned char *in, size_t len, unsigned char *out, int *statep, int *save)
@@ -606,12 +606,12 @@
  * @len: max length of data to decode
  * @out: output stream
  * @savestate: holds the number of bits that are stored in @save
- * @saved: leftover bits that have not yet been decoded
+ * @saveme: leftover bits that have not yet been decoded
  *
  * Decodes a block of quoted-printable encoded data. Performs a
  * 'decode step' on a chunk of QP encoded data.
  *
- * Returns the number of bytes decoded
+ * Returns: the number of bytes decoded
  **/
 size_t
 camel_quoted_decode_step(unsigned char *in, size_t len, unsigned char *out, int *savestate, int *saveme)
@@ -1327,7 +1327,7 @@
  *
  * Decodes rfc2047 encoded-word tokens
  *
- * Returns a string containing the UTF-8 version of the decoded header
+ * Returns: a string containing the UTF-8 version of the decoded header
  * value
  **/
 char *
@@ -1348,7 +1348,7 @@
  * Decodes a header which contains rfc2047 encoded-word tokens that
  * may or may not be within a comment.
  *
- * Returns a string containing the UTF-8 version of the decoded header
+ * Returns: a string containing the UTF-8 version of the decoded header
  * value
  **/
 char *
@@ -1480,7 +1480,7 @@
  *
  * Encodes a 'text' header according to the rules of rfc2047.
  *
- * Returns the rfc2047 encoded header
+ * Returns: the rfc2047 encoded header
  **/
 char *
 camel_header_encode_string (const unsigned char *in)
@@ -1790,7 +1790,7 @@
  *
  * Encodes a 'phrase' header according to the rules in rfc2047.
  *
- * Returns the encoded 'phrase'
+ * Returns: the encoded 'phrase'
  **/
 char *
 camel_header_encode_phrase (const unsigned char *in)
@@ -1904,7 +1904,7 @@
  * Gets the first token in the string according to the rules of
  * rfc0822.
  *
- * Returns a new string containing the first token in @in
+ * Returns: a new string containing the first token in @in
  **/
 char *
 camel_header_token_decode(const char *in)
@@ -2014,7 +2014,7 @@
  * Extracts an integer token from @in and updates the pointer to point
  * to after the end of the integer token (sort of like strtol).
  *
- * Returns the int value
+ * Returns: the int value
  **/
 int
 camel_header_decode_int(const char **in)
@@ -2130,7 +2130,7 @@
  *
  * Searches @params for a param named @name and gets the value.
  *
- * Returns the value of the @name param
+ * Returns: the value of the @name param
  **/
 char *
 camel_header_param (struct _camel_header_param *p, const char *name)
@@ -2151,7 +2151,7 @@
  *
  * Set a parameter in the list.
  *
- * Returns the set param
+ * Returns: the set param
  **/
 struct _camel_header_param *
 camel_header_set_param (struct _camel_header_param **l, const char *name, const char *value)
@@ -2199,7 +2199,7 @@
  * Searches the params on s #CamelContentType for a param named @name
  * and gets the value.
  *
- * Returns the value of the @name param
+ * Returns: the value of the @name param
  **/
 const char *
 camel_content_type_param (CamelContentType *t, const char *name)
@@ -2234,7 +2234,7 @@
  * The subtype of "*" will match any subtype.  If @ct is %NULL, then
  * it will match the type "text/plain".
  *
- * Returns %TRUE if the content type @ct is of type @type/@subtype or
+ * Returns: %TRUE if the content type @ct is of type @type/@subtype or
  * %FALSE otherwise
  **/
 int
@@ -2283,7 +2283,7 @@
  *
  * Create a new #CamelContentType.
  *
- * Returns the new #CamelContentType
+ * Returns: the new #CamelContentType
  **/
 CamelContentType *
 camel_content_type_new(const char *type, const char *subtype)
@@ -2767,7 +2767,7 @@
  *
  * Extract a message-id token from @in.
  *
- * Returns the msg-id
+ * Returns: the msg-id
  **/
 char *
 camel_header_msgid_decode(const char *in)
@@ -2785,7 +2785,7 @@
  *
  * Extract a content-id from @in.
  *
- * Returns the extracted content-id
+ * Returns: the extracted content-id
  **/
 char *
 camel_header_contentid_decode (const char *in)

Modified: trunk/camel/camel-mime-utils.h
==============================================================================
--- trunk/camel/camel-mime-utils.h	(original)
+++ trunk/camel/camel-mime-utils.h	Wed Jul 23 03:06:32 2008
@@ -197,8 +197,8 @@
    rather than ch_type_(action) */
 
 /* decode an email date field into a GMT time, + optional offset */
-time_t camel_header_decode_date (const char *in, int *saveoffset);
-char *camel_header_format_date (time_t time, int offset);
+time_t camel_header_decode_date (const char *str, int *tz_offset);
+char *camel_header_format_date (time_t date, int tz_offset);
 
 /* decode a message id */
 char *camel_header_msgid_decode (const char *in);
@@ -232,11 +232,11 @@
 /* do incremental base64/quoted-printable (de/en)coding */
 size_t camel_base64_decode_step (unsigned char *in, size_t len, unsigned char *out, int *state, unsigned int *save);
 
-size_t camel_base64_encode_step (unsigned char *in, size_t len, gboolean break_lines, unsigned char *out, int *state, int *save);
-size_t camel_base64_encode_close (unsigned char *in, size_t len, gboolean break_lines, unsigned char *out, int *state, int *save);
+size_t camel_base64_encode_step (unsigned char *in, size_t inlen, gboolean break_lines, unsigned char *out, int *state, int *save);
+size_t camel_base64_encode_close (unsigned char *in, size_t inlen, gboolean break_lines, unsigned char *out, int *state, int *save);
 #endif
 
-size_t camel_uudecode_step (unsigned char *in, size_t len, unsigned char *out, int *state, guint32 *save);
+size_t camel_uudecode_step (unsigned char *in, size_t inlen, unsigned char *out, int *state, guint32 *save);
 
 size_t camel_uuencode_step (unsigned char *in, size_t len, unsigned char *out, unsigned char *uubuf, int *state,
 		      guint32 *save);

Modified: trunk/camel/camel-multipart-encrypted.c
==============================================================================
--- trunk/camel/camel-multipart-encrypted.c	(original)
+++ trunk/camel/camel-multipart-encrypted.c	Wed Jul 23 03:06:32 2008
@@ -127,7 +127,7 @@
  * A MultipartEncrypted should be used to store and create parts of
  * type "multipart/encrypted".
  *
- * Returns a new #CamelMultipartEncrypted object
+ * Returns: a new #CamelMultipartEncrypted object
  **/
 CamelMultipartEncrypted *
 camel_multipart_encrypted_new (void)

Modified: trunk/camel/camel-multipart-signed.c
==============================================================================
--- trunk/camel/camel-multipart-signed.c	(original)
+++ trunk/camel/camel-multipart-signed.c	Wed Jul 23 03:06:32 2008
@@ -168,7 +168,7 @@
  * create a 'transport-safe' version (as safe as can be expected with
  * such a broken specification).
  *
- * Returns a new #CamelMultipartSigned object
+ * Returns: a new #CamelMultipartSigned object
  **/
 CamelMultipartSigned *
 camel_multipart_signed_new (void)
@@ -573,7 +573,7 @@
  * Get the raw signed content stream of the multipart/signed MIME part
  * suitable for use with verification of the signature.
  *
- * Returns the signed content stream
+ * Returns: the signed content stream
  **/
 CamelStream *
 camel_multipart_signed_get_content_stream(CamelMultipartSigned *mps, CamelException *ex)

Modified: trunk/camel/camel-multipart.c
==============================================================================
--- trunk/camel/camel-multipart.c	(original)
+++ trunk/camel/camel-multipart.c	Wed Jul 23 03:06:32 2008
@@ -151,7 +151,7 @@
  *
  * Create a new #CamelMultipart object.
  *
- * Returns a new #CamelMultipart object
+ * Returns: a new #CamelMultipart object
  **/
 CamelMultipart *
 camel_multipart_new (void)
@@ -280,7 +280,7 @@
  *
  * Remove the indicated part from the multipart object.
  *
- * Returns the removed part. Note that it is #camel_object_unref'ed
+ * Returns: the removed part. Note that it is #camel_object_unref'ed
  * before being returned, which may cause it to be destroyed.
  **/
 CamelMimePart *
@@ -312,7 +312,7 @@
  * @multipart: a #CamelMultipart object
  * @index: a zero-based index indicating the part to get
  *
- * Returns the indicated subpart, or %NULL
+ * Returns: the indicated subpart, or %NULL
  **/
 CamelMimePart *
 camel_multipart_get_part (CamelMultipart *multipart, guint index)
@@ -333,7 +333,7 @@
  * camel_multipart_get_number:
  * @multipart: a #CamelMultipart object
  *
- * Returns the number of subparts in @multipart
+ * Returns: the number of subparts in @multipart
  **/
 guint
 camel_multipart_get_number (CamelMultipart *multipart)
@@ -417,7 +417,7 @@
  * camel_multipart_get_boundary:
  * @multipart: a #CamelMultipart object
  *
- * Returns the boundary
+ * Returns: the boundary
  **/
 const char *
 camel_multipart_get_boundary (CamelMultipart *multipart)
@@ -596,7 +596,7 @@
  *
  * Construct a multipart from a parser.
  *
- * Returns %0 on success or %-1 on fail
+ * Returns: %0 on success or %-1 on fail
  **/
 int
 camel_multipart_construct_from_parser(CamelMultipart *multipart, struct _CamelMimeParser *mp)

Modified: trunk/camel/camel-nntp-address.c
==============================================================================
--- trunk/camel/camel-nntp-address.c	(original)
+++ trunk/camel/camel-nntp-address.c	Wed Jul 23 03:06:32 2008
@@ -189,7 +189,7 @@
  * camel_nntp_address_get:
  * @a: nntp address object
  * @index: address's array index
- * @addressp: Holder for the returned address, or NULL, if not required.
+ * @namep: Holder for the returned address, or NULL, if not required.
  * 
  * Get the address at @index.
  * 

Modified: trunk/camel/camel-nntp-address.h
==============================================================================
--- trunk/camel/camel-nntp-address.h	(original)
+++ trunk/camel/camel-nntp-address.h	Wed Jul 23 03:06:32 2008
@@ -46,8 +46,8 @@
 CamelType		camel_nntp_address_get_type	(void);
 CamelNNTPAddress   *camel_nntp_address_new	(void);
 
-int			camel_nntp_address_add	(CamelNNTPAddress *, const char *);
-gboolean		camel_nntp_address_get	(const CamelNNTPAddress *, int, const char **);
+int			camel_nntp_address_add	(CamelNNTPAddress *a, const char *name);
+gboolean		camel_nntp_address_get	(const CamelNNTPAddress *a, int index, const char **namep);
 
 G_END_DECLS
 

Modified: trunk/camel/camel-object.h
==============================================================================
--- trunk/camel/camel-object.h	(original)
+++ trunk/camel/camel-object.h	Wed Jul 23 03:06:32 2008
@@ -275,7 +275,7 @@
 void *camel_object_bag_get(CamelObjectBag *bag, const void *key);
 void *camel_object_bag_peek(CamelObjectBag *bag, const void *key);
 void *camel_object_bag_reserve(CamelObjectBag *bag, const void *key);
-void camel_object_bag_add(CamelObjectBag *bag, const void *key, void *o);
+void camel_object_bag_add(CamelObjectBag *bag, const void *key, void *vo);
 void camel_object_bag_abort(CamelObjectBag *bag, const void *key);
 void camel_object_bag_rekey(CamelObjectBag *bag, void *o, const void *newkey);
 GPtrArray *camel_object_bag_list(CamelObjectBag *bag);

Modified: trunk/camel/camel-offline-folder.h
==============================================================================
--- trunk/camel/camel-offline-folder.h	(original)
+++ trunk/camel/camel-offline-folder.h	Wed Jul 23 03:06:32 2008
@@ -60,7 +60,7 @@
 
 CamelType camel_offline_folder_get_type (void);
 
-void camel_offline_folder_downsync (CamelOfflineFolder *folder, const char *expression, CamelException *ex);
+void camel_offline_folder_downsync (CamelOfflineFolder *offline, const char *expression, CamelException *ex);
 
 G_END_DECLS
 

Modified: trunk/camel/camel-offline-journal.c
==============================================================================
--- trunk/camel/camel-offline-journal.c	(original)
+++ trunk/camel/camel-offline-journal.c	Wed Jul 23 03:06:32 2008
@@ -150,7 +150,7 @@
  *
  * Save the journal to disk.
  *
- * Returns %0 on success or %-1 on fail
+ * Returns: %0 on success or %-1 on fail
  **/
 int
 camel_offline_journal_write (CamelOfflineJournal *journal, CamelException *ex)
@@ -200,7 +200,7 @@
  *
  * Replay all entries in the journal.
  *
- * Returns %0 on success (no entry failed to replay) or %-1 on fail
+ * Returns: %0 on success (no entry failed to replay) or %-1 on fail
  **/
 int
 camel_offline_journal_replay (CamelOfflineJournal *journal, CamelException *ex)

Modified: trunk/camel/camel-operation.c
==============================================================================
--- trunk/camel/camel-operation.c	(original)
+++ trunk/camel/camel-operation.c	Wed Jul 23 03:06:32 2008
@@ -164,7 +164,7 @@
 /**
  * camel_operation_registered:
  *
- * Returns the registered operation, or %NULL if none registered.
+ * Returns: the registered operation, or %NULL if none registered.
  **/
 CamelOperation *
 camel_operation_registered (void)
@@ -350,7 +350,7 @@
  * operation_register again with that, to automatically stack
  * registrations.
  *
- * Return Value: Returns the previously registered operatoin.
+ * Returns: the previously registered operatoin.
  *
  **/
 CamelOperation *
@@ -653,8 +653,6 @@
 /**
  * camel_operation_end:
  * @cc: operation context
- * @what: Format string.
- * @Varargs: varargs 
  * 
  * Report the end of an operation.  If @cc is NULL, then the currently
  * registered operation is notified.

Modified: trunk/camel/camel-provider.c
==============================================================================
--- trunk/camel/camel-provider.c	(original)
+++ trunk/camel/camel-provider.c	Wed Jul 23 03:06:32 2008
@@ -166,7 +166,6 @@
 
 /**
  * camel_provider_load:
- * @session: the current session
  * @path: the path to a shared library
  * @ex: a CamelException
  *
@@ -385,12 +384,12 @@
 /**
  * camel_provider_auto_detect:
  * @provider: camel provider
- * @settings: currently set settings
+ * @url: a #CamelURL
  * @auto_detected: output hash table of auto-detected values
  * @ex: exception
  *
  * After filling in the standard Username/Hostname/Port/Path settings
- * (which must be set in @settings), if the provider supports it, you
+ * (which must be set in @url), if the provider supports it, you
  * may wish to have the provider auto-detect further settings based on
  * the aformentioned settings.
  *
@@ -398,10 +397,10 @@
  * will be set to %NULL. Otherwise the provider will attempt to
  * auto-detect whatever it can and file them into @auto_detected. If
  * for some reason it cannot auto-detect anything (not enough
- * information provided in @settings?) then @auto_deetected will be
+ * information provided in @url?) then @auto_detected will be
  * set to %NULL and an exception may be set to explain why it failed.
  *
- * Returns 0 on success or -1 on fail.
+ * Returns: 0 on success or -1 on fail.
  **/
 int
 camel_provider_auto_detect (CamelProvider *provider, CamelURL *url,

Modified: trunk/camel/camel-sasl-anonymous.c
==============================================================================
--- trunk/camel/camel-sasl-anonymous.c	(original)
+++ trunk/camel/camel-sasl-anonymous.c	Wed Jul 23 03:06:32 2008
@@ -96,7 +96,7 @@
  *
  * Create a new #CamelSaslAnonymous object.
  *
- * Returns a new #CamelSasl object
+ * Returns: a new #CamelSasl object
  **/
 CamelSasl *
 camel_sasl_anonymous_new (CamelSaslAnonTraceType type, const char *trace_info)

Modified: trunk/camel/camel-sasl.c
==============================================================================
--- trunk/camel/camel-sasl.c	(original)
+++ trunk/camel/camel-sasl.c	Wed Jul 23 03:06:32 2008
@@ -104,7 +104,7 @@
  * exchange.) Otherwise, @token is a challenge from the server, and
  * the return value is the response.
  *
- * Returns the SASL response or %NULL. If an error occurred, @ex will
+ * Returns: the SASL response or %NULL. If an error occurred, @ex will
  * also be set.
  **/
 GByteArray *
@@ -124,7 +124,7 @@
  * As with #camel_sasl_challenge, but the challenge @token and the
  * response are both base64-encoded.
  *
- * Returns the base64 encoded challenge string
+ * Returns: the base64 encoded challenge string
  **/
 char *
 camel_sasl_challenge_base64 (CamelSasl *sasl, const char *token, CamelException *ex)
@@ -164,7 +164,7 @@
  * camel_sasl_authenticated:
  * @sasl: a #CamelSasl object
  *
- * Returns whether or not @sasl has successfully authenticated the
+ * Returns: whether or not @sasl has successfully authenticated the
  * user. This will be %TRUE after it returns the last needed response.
  * The caller must still pass that information on to the server and
  * verify that it has accepted it.
@@ -182,7 +182,7 @@
  * @mechanism: the SASL mechanism
  * @service: the CamelService that will be using this SASL
  *
- * Returns a new #CamelSasl object for the given @service_name,
+ * Returns: a new #CamelSasl object for the given @service_name,
  * @mechanism, and @service, or %NULL if the mechanism is not
  * supported.
  **/
@@ -232,7 +232,7 @@
  * camel_sasl_authtype_list:
  * @include_plain: whether or not to include the PLAIN mechanism
  *
- * Returns a #GList of SASL-supported authtypes. The caller must
+ * Returns: a #GList of SASL-supported authtypes. The caller must
  * free the list, but not the contents.
  **/
 GList *
@@ -259,7 +259,7 @@
  * camel_sasl_authtype:
  * @mechanism: the SASL mechanism to get an authtype for
  *
- * Returns a #CamelServiceAuthType for the given mechanism, if
+ * Returns: a #CamelServiceAuthType for the given mechanism, if
  * it is supported.
  **/
 CamelServiceAuthType *

Modified: trunk/camel/camel-seekable-stream.c
==============================================================================
--- trunk/camel/camel-seekable-stream.c	(original)
+++ trunk/camel/camel-seekable-stream.c	Wed Jul 23 03:06:32 2008
@@ -137,7 +137,7 @@
  *
  * Get the current position of a seekable stream.
  *
- * Returns the current position of the stream.
+ * Returns: the current position of the stream.
  **/
 off_t
 camel_seekable_stream_tell (CamelSeekableStream *stream)
@@ -170,7 +170,7 @@
  * there is to be no @end value, then @end should be set to
  * #CAMEL_STREAM_UNBOUND.
  *
- * Returns %-1 on error.
+ * Returns: %-1 on error.
  **/
 int
 camel_seekable_stream_set_bounds (CamelSeekableStream *stream,

Modified: trunk/camel/camel-seekable-substream.c
==============================================================================
--- trunk/camel/camel-seekable-substream.c	(original)
+++ trunk/camel/camel-seekable-substream.c	Wed Jul 23 03:06:32 2008
@@ -95,8 +95,8 @@
 /**
  * camel_seekable_substream_new:
  * @parent_stream: a #CamelSeekableStream object
- * @inf_bound: a lower bound
- * @sup_bound: an upper bound
+ * @start: a lower bound
+ * @end: an upper bound
  *
  * Creates a new CamelSeekableSubstream that references the portion
  * of @parent_stream from @inf_bound to @sup_bound. (If @sup_bound is

Modified: trunk/camel/camel-service.c
==============================================================================
--- trunk/camel/camel-service.c	(original)
+++ trunk/camel/camel-service.c	Wed Jul 23 03:06:32 2008
@@ -336,7 +336,7 @@
  * Connect to the service using the parameters it was initialized
  * with.
  *
- * Returns %TRUE if the connection is made or %FALSE otherwise
+ * Returns: %TRUE if the connection is made or %FALSE otherwise
  **/
 gboolean
 camel_service_connect (CamelService *service, CamelException *ex)
@@ -408,7 +408,7 @@
  * Disconnect from the service. If @clean is %FALSE, it should not
  * try to do any synchronizing or other cleanup of the connection.
  *
- * Returns %TRUE if the disconnect was successful or %FALSE otherwise
+ * Returns: %TRUE if the disconnect was successful or %FALSE otherwise
  **/
 gboolean
 camel_service_disconnect (CamelService *service, gboolean clean,
@@ -480,7 +480,7 @@
  * freed when it is no longer needed. For security reasons, this
  * routine does not return the password.
  *
- * Returns the URL representing @service
+ * Returns: the URL representing @service
  **/
 char *
 camel_service_get_url (CamelService *service)
@@ -508,7 +508,7 @@
  * such as for use in the folder tree. If @brief is %FALSE, it should
  * be a more complete and mostly unambiguous description.
  *
- * Returns a description of the service which the caller must free
+ * Returns: a description of the service which the caller must free
  **/
 char *
 camel_service_get_name (CamelService *service, gboolean brief)
@@ -573,7 +573,7 @@
  * provider, followed by a "/", but after that, it is up to the
  * provider.
  *
- * Returns the path, which the caller must free
+ * Returns: the path, which the caller must free
  **/
 char *
 camel_service_get_path (CamelService *service)
@@ -591,7 +591,7 @@
  *
  * Gets the #CamelSession associated with the service.
  *
- * Returns the session
+ * Returns: the session
  **/
 CamelSession *
 camel_service_get_session (CamelService *service)
@@ -606,7 +606,7 @@
  *
  * Gets the #CamelProvider associated with the service.
  *
- * Returns the provider
+ * Returns: the provider
  **/
 CamelProvider *
 camel_service_get_provider (CamelService *service)
@@ -630,7 +630,7 @@
  * authentication types supported by the protocol, and information
  * about them.
  *
- * Returns a list of #CamelServiceAuthType records. The caller
+ * Returns: a list of #CamelServiceAuthType records. The caller
  * must free the list with #g_list_free when it is done with it.
  **/
 GList *

Modified: trunk/camel/camel-session.c
==============================================================================
--- trunk/camel/camel-session.c	(original)
+++ trunk/camel/camel-session.c	Wed Jul 23 03:06:32 2008
@@ -228,7 +228,7 @@
  * incremented by one each time). What constitutes "the same" URL
  * depends in part on the provider.
  *
- * Returns the requested #CamelService, or %NULL
+ * Returns: the requested #CamelService, or %NULL
  **/
 CamelService *
 camel_session_get_service (CamelSession *session, const char *url_string,
@@ -257,7 +257,7 @@
  * the returned service will have been successfully connected (via
  * #camel_service_connect.)
  *
- * Returns the requested #CamelService, or %NULL
+ * Returns: the requested #CamelService, or %NULL
  **/
 CamelService *
 camel_session_get_service_connected (CamelSession *session,
@@ -321,7 +321,7 @@
  * files in this directory. If the directory does not exist, it will
  * be created.
  *
- * Returns the path (which the caller must free), or %NULL if an error
+ * Returns: the path (which the caller must free), or %NULL if an error
  * occurs.
  **/
 char *
@@ -365,7 +365,7 @@
  * the user did not provide the information. The caller must #g_free
  * the information returned when it is done with it.
  *
- * Returns the authentication information or %NULL
+ * Returns: the authentication information or %NULL
  **/
 char *
 camel_session_get_password (CamelSession *session, CamelService *service,
@@ -420,7 +420,7 @@
  * @type. If @cancel is %TRUE, the user will be able to accept or
  * cancel. Otherwise, the message is purely informational.
  *
- * Returns %TRUE if the user accepts, %FALSE if they cancel.
+ * Returns: %TRUE if the user accepts, %FALSE if they cancel.
  */
 gboolean
 camel_session_alert_user (CamelSession *session, CamelSessionAlertType type,
@@ -488,7 +488,7 @@
  * camel_session_is_online:
  * @session: a #CamelSession object
  *
- * Returns whether or not @session is online
+ * Returns: whether or not @session is online
  **/
 gboolean
 camel_session_is_online (CamelSession *session)
@@ -518,7 +518,7 @@
  * @type: the type of filter (eg, "incoming")
  * @ex: a #CamelException
  *
- * Returns a filter driver, loaded with applicable rules
+ * Returns: a filter driver, loaded with applicable rules
  **/
 CamelFilterDriver *
 camel_session_get_filter_driver (CamelSession *session,
@@ -657,7 +657,7 @@
  * @ops points to the operations used to recieve/process and finally
  * free the message.
  *
- * Returns a new #CamelSessionThreadMsg
+ * Returns: a new #CamelSessionThreadMsg
  **/
 void *
 camel_session_thread_msg_new (CamelSession *session,
@@ -699,7 +699,7 @@
  * The operation should be (but needn't) run in a queued manner
  * with other operations queued in this manner.
  * 
- * Returns the id of the operation queued
+ * Returns: the id of the operation queued
  **/
 int
 camel_session_thread_queue (CamelSession *session,
@@ -737,7 +737,7 @@
  * 
  * Do we have to check incoming messages to be junk?
  *
- * Returns whether or not we are checking incoming messages for junk
+ * Returns: whether or not we are checking incoming messages for junk
  **/
 gboolean
 camel_session_check_junk (CamelSession *session)

Modified: trunk/camel/camel-smime-context.c
==============================================================================
--- trunk/camel/camel-smime-context.c	(original)
+++ trunk/camel/camel-smime-context.c	Wed Jul 23 03:06:32 2008
@@ -92,7 +92,7 @@
  *
  * Creates a new sm cipher context object.
  *
- * Returns a new sm cipher context object.
+ * Returns: a new sm cipher context object.
  **/
 CamelCipherContext *
 camel_smime_context_new(CamelSession *session)

Modified: trunk/camel/camel-store-summary.c
==============================================================================
--- trunk/camel/camel-store-summary.c	(original)
+++ trunk/camel/camel-store-summary.c	Wed Jul 23 03:06:32 2008
@@ -162,7 +162,7 @@
  *
  * Create a new #CamelStoreSummary object.
  * 
- * Returns a new #CamelStoreSummary object
+ * Returns: a new #CamelStoreSummary object
  **/
 CamelStoreSummary *
 camel_store_summary_new (void)
@@ -216,7 +216,7 @@
  * 
  * Get the number of summary items stored in this summary.
  * 
- * Returns the number of items int he summary.
+ * Returns: the number of items int he summary.
  **/
 int
 camel_store_summary_count(CamelStoreSummary *s)
@@ -237,7 +237,7 @@
  *
  * It must be freed using #camel_store_summary_info_free.
  * 
- * Returns the summary item, or %NULL if @index is out of range
+ * Returns: the summary item, or %NULL if @index is out of range
  **/
 CamelStoreInfo *
 camel_store_summary_index(CamelStoreSummary *s, int i)
@@ -270,7 +270,7 @@
  *
  * It must be freed using #camel_store_summary_array_free.
  *
- * Returns the summary array
+ * Returns: the summary array
  **/
 GPtrArray *
 camel_store_summary_array(CamelStoreSummary *s)
@@ -326,7 +326,7 @@
  *
  * It must be freed using #camel_store_summary_info_free.
  *
- * Returns the summary item, or %NULL if the @path name is not
+ * Returns: the summary item, or %NULL if the @path name is not
  * available
  **/
 CamelStoreInfo *
@@ -355,7 +355,7 @@
  *
  * Load the summary off disk.
  *
- * Returns %0 on success or %-1 on fail
+ * Returns: %0 on success or %-1 on fail
  **/
 int
 camel_store_summary_load(CamelStoreSummary *s)
@@ -412,7 +412,7 @@
  * Writes the summary to disk.  The summary is only written if changes
  * have occured.
  * 
- * Returns %0 on succes or %-1 on fail
+ * Returns: %0 on succes or %-1 on fail
  **/
 int
 camel_store_summary_save(CamelStoreSummary *s)
@@ -494,7 +494,7 @@
  * keep the rest on disk.  This should only be done on
  * a fresh summary object.
  * 
- * Returns %0 on success or %-1 on fail
+ * Returns: %0 on success or %-1 on fail
  **/
 int
 camel_store_summary_header_load(CamelStoreSummary *s)
@@ -559,7 +559,7 @@
  * 
  * Build a new info record based on the name, and add it to the summary.
  *
- * Returns the newly added record
+ * Returns: the newly added record
  **/
 CamelStoreInfo *
 camel_store_summary_add_from_path(CamelStoreSummary *s, const char *path)
@@ -596,7 +596,7 @@
  * #camel_store_summary_info_free, #camel_store_info_free will not
  * work.
  *
- * Returns the #CamelStoreInfo associated with @path
+ * Returns: the #CamelStoreInfo associated with @path
  **/
 CamelStoreInfo *
 camel_store_summary_info_new_from_path(CamelStoreSummary *s, const char *path)
@@ -824,7 +824,7 @@
  * Allocate a new #CamelStoreInfo, suitable for adding to this
  * summary.
  * 
- * Returns the newly allocated #CamelStoreInfo
+ * Returns: the newly allocated #CamelStoreInfo
  **/
 CamelStoreInfo *
 camel_store_summary_info_new(CamelStoreSummary *s)
@@ -845,7 +845,7 @@
  *
  * Get a specific string from the @info.
  *
- * Returns the string value
+ * Returns: the string value
  **/
 const char *
 camel_store_info_string(CamelStoreSummary *s, const CamelStoreInfo *info, int type)

Modified: trunk/camel/camel-store.c
==============================================================================
--- trunk/camel/camel-store.c	(original)
+++ trunk/camel/camel-store.c	Wed Jul 23 03:06:32 2008
@@ -261,7 +261,7 @@
  *
  * Get a specific folder object from the store by name.
  *
- * Returns the folder corresponding to the path @folder_name.
+ * Returns: the folder corresponding to the path @folder_name.
  **/
 CamelFolder *
 camel_store_get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)
@@ -359,7 +359,7 @@
  * Creates a new folder as a child of an existing folder.
  * @parent_name can be %NULL to create a new top-level folder.
  *
- * Returns info about the created folder, which the caller must
+ * Returns: info about the created folder, which the caller must
  * free with #camel_store_free_folder_info
  **/
 CamelFolderInfo *
@@ -580,7 +580,7 @@
  * @store: a #CamelStore object
  * @ex: a #CamelException
  *
- * Returns the folder in the store into which new mail is delivered,
+ * Returns: the folder in the store into which new mail is delivered,
  * or %NULL if no such folder exists.
  **/
 CamelFolder *
@@ -596,7 +596,7 @@
 }
 
 static CamelFolder *
-get_special(CamelStore *store, enum _camel_vtrash_folder_t type)
+get_special(CamelStore *store, camel_vtrash_folder_t type)
 {
 	CamelFolder *folder;
 	GPtrArray *folders;
@@ -631,7 +631,7 @@
  * @store: a #CamelStore object
  * @ex: a #CamelException
  *
- * Returns the folder in the store into which trash is delivered, or
+ * Returns: the folder in the store into which trash is delivered, or
  * %NULL if no such folder exists.
  **/
 CamelFolder *
@@ -648,7 +648,7 @@
  * @store: a #CamelStore object
  * @ex: a #CamelException
  *
- * Returns the folder in the store into which junk is delivered, or
+ * Returns: the folder in the store into which junk is delivered, or
  * %NULL if no such folder exists.
  **/
 CamelFolder *
@@ -812,7 +812,7 @@
  * supplied or not.  The only guaranteed way to get updated folder
  * counts is to both open the folder and invoke refresh_info() it.
  *
- * Returns a #CamelFolderInfo tree, which must be freed with
+ * Returns: a #CamelFolderInfo tree, which must be freed with
  * #camel_store_free_folder_info
  **/
 CamelFolderInfo *
@@ -951,7 +951,7 @@
  * NOTE: This is deprected, do not use this.
  * FIXME: remove this/move it to imap, which is the only user of it now.
  *
- * Returns the top level of the tree of linked folder info.
+ * Returns: the top level of the tree of linked folder info.
  **/
 CamelFolderInfo *
 camel_folder_info_build (GPtrArray *folders, const char *namespace,
@@ -1088,7 +1088,7 @@
  *
  * Clones @fi recursively.
  *
- * Returns the cloned #CamelFolderInfo tree.
+ * Returns: the cloned #CamelFolderInfo tree.
  **/
 CamelFolderInfo *
 camel_folder_info_clone(CamelFolderInfo *fi)
@@ -1106,7 +1106,7 @@
  *
  * Get whether or not @store supports subscriptions to folders.
  *
- * Returns %TRUE if folder subscriptions are supported or %FALSE otherwise
+ * Returns: %TRUE if folder subscriptions are supported or %FALSE otherwise
  **/
 gboolean
 camel_store_supports_subscriptions (CamelStore *store)
@@ -1130,7 +1130,7 @@
  *
  * Find out if a folder has been subscribed to.
  *
- * Returns %TRUE if the folder has been subscribed to or %FALSE otherwise
+ * Returns: %TRUE if the folder has been subscribed to or %FALSE otherwise
  **/
 gboolean
 camel_store_folder_subscribed(CamelStore *store, const char *folder_name)
@@ -1244,7 +1244,7 @@
  *
  * Compares 2 folder uris to check that they are equal.
  *
- * Returns %TRUE if they are equal or %FALSE otherwise
+ * Returns: %TRUE if they are equal or %FALSE otherwise
  **/
 int
 camel_store_folder_uri_equal (CamelStore *store, const char *uri0, const char *uri1)
@@ -1300,15 +1300,16 @@
 
 /**
  * camel_store_can_refresh_folder
+ * @store: a #CamelStore
+ * @info: a #CamelFolderInfo
+ * @ex: a #CamelException
+ *
  * Returns if this folder (param info) should be checked for new mail or not.
  * It should not look into sub infos (info->child) or next infos, it should
  * return value only for the actual folder info.
  * Default behavior is that all Inbox folders are intended to be refreshed.
  *
- * @param store Store, to which belong folder.
- * @param info Info of folder of our interest.
- * @param ex [out] Will set this exception in case of any error.
- * @return Whether folder should be checked for new mails or not.
+ * Returns: whether folder should be checked for new mails
  **/
 gboolean
 camel_store_can_refresh_folder (CamelStore *store, CamelFolderInfo *info, CamelException *ex)

Modified: trunk/camel/camel-store.h
==============================================================================
--- trunk/camel/camel-store.h	(original)
+++ trunk/camel/camel-store.h	Wed Jul 23 03:06:32 2008
@@ -217,7 +217,7 @@
 						 const char *folder_name,
 						 CamelException *ex);
 void             camel_store_rename_folder      (CamelStore *store,
-						 const char *old_name,
+						 const char *old_namein,
 						 const char *new_name,
 						 CamelException *ex);
 

Modified: trunk/camel/camel-stream-buffer.c
==============================================================================
--- trunk/camel/camel-stream-buffer.c	(original)
+++ trunk/camel/camel-stream-buffer.c	Wed Jul 23 03:06:32 2008
@@ -168,7 +168,7 @@
  * See #camel_stream_buffer_new_with_vbuf for details on the
  * @mode parameter.
  *
- * Returns a newly created buffered stream.
+ * Returns: a newly created buffered stream.
  **/
 CamelStream *
 camel_stream_buffer_new (CamelStream *stream, CamelStreamBufferMode mode)
@@ -381,7 +381,7 @@
  * If the newline character is encountered, then it will be
  * included in the buffer @buf.  The buffer will be #NUL terminated.
  *
- * Returns the number of characters read, or %0 for end of file,
+ * Returns: the number of characters read, or %0 for end of file,
  * and %-1 on error.
  **/
 int
@@ -435,7 +435,7 @@
  * and returns it in allocated memory. The trailing newline (and carriage
  * return if any) are not included in the returned string.
  *
- * Returns the line read, which the caller must free when done with,
+ * Returns: the line read, which the caller must free when done with,
  * or %NULL on eof. If an error occurs, @ex will be set.
  **/
 char *

Modified: trunk/camel/camel-stream-filter.c
==============================================================================
--- trunk/camel/camel-stream-filter.c	(original)
+++ trunk/camel/camel-stream-filter.c	Wed Jul 23 03:06:32 2008
@@ -142,7 +142,7 @@
  *
  * Create a new #CamelStreamFilter object.
  * 
- * Returns a new #CamelStreamFilter object.
+ * Returns: a new #CamelStreamFilter object.
  **/
 CamelStreamFilter *
 camel_stream_filter_new_with_stream(CamelStream *stream)
@@ -166,7 +166,7 @@
  * Note that a filter should only be added to a single stream
  * at a time, otherwise unpredictable results may occur.
  * 
- * Returns a filter id for the added @filter.
+ * Returns: a filter id for the added @filter.
  **/
 int
 camel_stream_filter_add (CamelStreamFilter *stream, CamelMimeFilter *filter)

Modified: trunk/camel/camel-stream-fs.c
==============================================================================
--- trunk/camel/camel-stream-fs.c	(original)
+++ trunk/camel/camel-stream-fs.c	Wed Jul 23 03:06:32 2008
@@ -116,7 +116,7 @@
  * backing store. When the stream is destroyed, the file descriptor
  * will be closed.
  *
- * Returns a new #CamelStreamFs
+ * Returns: a new #CamelStreamFs
  **/
 CamelStream *
 camel_stream_fs_new_with_fd (int fd)
@@ -146,7 +146,7 @@
  * Gets a stream associated with the given file descriptor and bounds.
  * When the stream is destroyed, the file descriptor will be closed.
  *
- * Returns the bound stream
+ * Returns: the bound stream
  **/
 CamelStream *
 camel_stream_fs_new_with_fd_and_bounds (int fd, off_t start, off_t end)
@@ -168,7 +168,7 @@
  * Creates a new #CamelStreamFs corresponding to the named file, flags,
  * and mode.
  *
- * Returns the new stream, or %NULL on error.
+ * Returns: the new stream, or %NULL on error.
  **/
 CamelStream *
 camel_stream_fs_new_with_name (const char *name, int flags, mode_t mode)
@@ -193,7 +193,7 @@
  *
  * Creates a new CamelStream corresponding to the given arguments.
  *
- * Returns the stream, or %NULL on error.
+ * Returns: the stream, or %NULL on error.
  **/
 CamelStream *
 camel_stream_fs_new_with_name_and_bounds (const char *name, int flags,

Modified: trunk/camel/camel-stream-mem.c
==============================================================================
--- trunk/camel/camel-stream-mem.c	(original)
+++ trunk/camel/camel-stream-mem.c	Wed Jul 23 03:06:32 2008
@@ -116,7 +116,7 @@
  *
  * Create a new #CamelStreamMem object.
  *
- * Returns a new #CamelStreamMem
+ * Returns: a new #CamelStreamMem
  **/
 CamelStream *
 camel_stream_mem_new (void)
@@ -136,7 +136,7 @@
  * for use as the stream backing. This may have resource implications
  * you may wish to consider.
  *
- * Returns a new #CamelStreamMem
+ * Returns: a new #CamelStreamMem
  **/
 CamelStream *
 camel_stream_mem_new_with_buffer (const char *buffer, size_t len)
@@ -158,7 +158,7 @@
  * Note: The newly created #CamelStreamMem will destroy @buffer
  * when destroyed.
  *
- * Returns a new #CamelStreamMem
+ * Returns: a new #CamelStreamMem
  **/
 CamelStream *
 camel_stream_mem_new_with_byte_array (GByteArray *buffer)

Modified: trunk/camel/camel-stream-null.c
==============================================================================
--- trunk/camel/camel-stream-null.c	(original)
+++ trunk/camel/camel-stream-null.c	Wed Jul 23 03:06:32 2008
@@ -82,7 +82,7 @@
  * Returns a null stream.  A null stream is always at eof, and
  * always returns success for all reads and writes.
  *
- * Returns a new #CamelStreamNull
+ * Returns: a new #CamelStreamNull
  **/
 CamelStream *
 camel_stream_null_new(void)

Modified: trunk/camel/camel-stream-vfs.c
==============================================================================
--- trunk/camel/camel-stream-vfs.c	(original)
+++ trunk/camel/camel-stream-vfs.c	Wed Jul 23 03:06:32 2008
@@ -105,7 +105,7 @@
  * backing store. When the stream is destroyed, the file descriptor
  * will be closed. This will not increase reference counter on the stream.
  *
- * Returns a new #CamelStreamVFS
+ * Returns: a new #CamelStreamVFS
  **/
 CamelStream *
 camel_stream_vfs_new_with_stream (GObject *stream)
@@ -133,7 +133,7 @@
  *
  * Creates a new #CamelStreamVFS corresponding to the named file and mode.
  *
- * Returns the new stream, or %NULL on error.
+ * Returns: the new stream, or %NULL on error.
  **/
 CamelStream *
 camel_stream_vfs_new_with_uri (const char *uri, CamelStreamVFSOpenMethod mode)
@@ -175,7 +175,7 @@
  * camel_stream_vfs_is_writable:
  * @stream_vfs: a #CamelStreamVFS instance
  *
- * Returns whether is the underlying stream writable or not.
+ * Returns: whether is the underlying stream writable or not.
  **/
 gboolean
 camel_stream_vfs_is_writable (CamelStreamVFS *stream_vfs)

Modified: trunk/camel/camel-stream-vfs.h
==============================================================================
--- trunk/camel/camel-stream-vfs.h	(original)
+++ trunk/camel/camel-stream-vfs.h	Wed Jul 23 03:06:32 2008
@@ -61,7 +61,7 @@
 } CamelStreamVFSOpenMethod;
 
 /* public methods */
-CamelStream * camel_stream_vfs_new_with_uri            (const char *uri, CamelStreamVFSOpenMethod method);
+CamelStream * camel_stream_vfs_new_with_uri            (const char *uri, CamelStreamVFSOpenMethod mode);
 CamelStream * camel_stream_vfs_new_with_stream         (GObject *stream);
 
 gboolean      camel_stream_vfs_is_writable             (CamelStreamVFS *stream_vfs);

Modified: trunk/camel/camel-stream.c
==============================================================================
--- trunk/camel/camel-stream.c	(original)
+++ trunk/camel/camel-stream.c	Wed Jul 23 03:06:32 2008
@@ -86,7 +86,7 @@
  *
  * Attempts to read up to @len bytes from @stream into @buf.
  *
- * Returns the number of bytes actually read, or %-1 on error and set
+ * Returns: the number of bytes actually read, or %-1 on error and set
  * errno.
  **/
 ssize_t
@@ -107,7 +107,7 @@
  *
  * Attempts to write up to @n bytes of @buffer into @stream.
  *
- * Returns the number of bytes written to the stream, or %-1 on error
+ * Returns: the number of bytes written to the stream, or %-1 on error
  * along with setting errno.
  **/
 ssize_t
@@ -127,7 +127,7 @@
  * Flushes any buffered data to the stream's backing store.  Only
  * meaningful for writable streams.
  *
- * Returns %0 on success or %-1 on fail along with setting errno.
+ * Returns: %0 on success or %-1 on fail along with setting errno.
  **/
 int
 camel_stream_flush (CamelStream *stream)
@@ -144,7 +144,7 @@
  * 
  * Closes the stream.
  * 
- * Returns %0 on success or %-1 on error.
+ * Returns: %0 on success or %-1 on error.
  **/
 int
 camel_stream_close (CamelStream *stream)
@@ -161,7 +161,7 @@
  *
  * Tests if there are bytes left to read on the @stream object.
  *
- * Returns %TRUE on EOS or %FALSE otherwise.
+ * Returns: %TRUE on EOS or %FALSE otherwise.
  **/
 gboolean
 camel_stream_eos (CamelStream *stream)
@@ -180,7 +180,7 @@
  * from the beginning again. Not all streams in Camel are seekable,
  * but they must all be resettable.
  *
- * Returns %0 on success or %-1 on error along with setting errno.
+ * Returns: %0 on success or %-1 on error along with setting errno.
  **/
 int
 camel_stream_reset (CamelStream *stream)
@@ -199,7 +199,7 @@
  *
  * Writes the string to the stream.
  *
- * Returns the number of characters written or %-1 on error.
+ * Returns: the number of characters written or %-1 on error.
  **/
 ssize_t
 camel_stream_write_string (CamelStream *stream, const char *string)
@@ -215,7 +215,7 @@
  *
  * Write formatted output to a stream.
  *
- * Returns the number of characters written or %-1 on error.
+ * Returns: the number of characters written or %-1 on error.
  **/
 ssize_t
 camel_stream_printf (CamelStream *stream, const char *fmt, ... )
@@ -247,7 +247,7 @@
  * Write all of a stream (until eos) into another stream, in a
  * blocking fashion.
  *
- * Returns %-1 on error, or the number of bytes succesfully
+ * Returns: %-1 on error, or the number of bytes succesfully
  * copied across streams.
  **/
 ssize_t

Modified: trunk/camel/camel-tcp-stream-openssl.c
==============================================================================
--- trunk/camel/camel-tcp-stream-openssl.c	(original)
+++ trunk/camel/camel-tcp-stream-openssl.c	Wed Jul 23 03:06:32 2008
@@ -247,7 +247,7 @@
  *
  * Toggles an ssl-capable stream into ssl mode (if it isn't already).
  *
- * Returns 0 on success or -1 on fail.
+ * Returns: 0 on success or -1 on fail.
  **/
 int
 camel_tcp_stream_ssl_enable_ssl (CamelTcpStreamSSL *stream)

Modified: trunk/camel/camel-tcp-stream-raw.c
==============================================================================
--- trunk/camel/camel-tcp-stream-raw.c	(original)
+++ trunk/camel/camel-tcp-stream-raw.c	Wed Jul 23 03:06:32 2008
@@ -232,7 +232,7 @@
  *
  * Create a new #CamelTcpStreamRaw object.
  *
- * Returns a new #CamelTcpStream object
+ * Returns: a new #CamelTcpStream object
  **/
 CamelStream *
 camel_tcp_stream_raw_new (void)

Modified: trunk/camel/camel-tcp-stream-ssl.c
==============================================================================
--- trunk/camel/camel-tcp-stream-ssl.c	(original)
+++ trunk/camel/camel-tcp-stream-ssl.c	Wed Jul 23 03:06:32 2008
@@ -177,7 +177,7 @@
  * user, a #CamelSession is needed. @expected_host is needed as a
  * protection against an MITM attack.
  *
- * Returns a new #CamelTcpStreamSSL stream preset in SSL mode
+ * Returns: a new #CamelTcpStreamSSL stream preset in SSL mode
  **/
 CamelStream *
 camel_tcp_stream_ssl_new (CamelSession *session, const char *expected_host, guint32 flags)
@@ -211,7 +211,7 @@
  * user, a CamelSession is needed. @expected_host is needed as a
  * protection against an MITM attack.
  *
- * Returns a new #CamelTcpStreamSSL stream not yet toggled into SSL mode
+ * Returns: a new #CamelTcpStreamSSL stream not yet toggled into SSL mode
  **/
 CamelStream *
 camel_tcp_stream_ssl_new_raw (CamelSession *session, const char *expected_host, guint32 flags)
@@ -301,7 +301,7 @@
  *
  * Toggles an ssl-capable stream into ssl mode (if it isn't already).
  *
- * Returns %0 on success or %-1 on fail
+ * Returns: %0 on success or %-1 on fail
  **/
 int
 camel_tcp_stream_ssl_enable_ssl (CamelTcpStreamSSL *ssl)

Modified: trunk/camel/camel-tcp-stream.c
==============================================================================
--- trunk/camel/camel-tcp-stream.c	(original)
+++ trunk/camel/camel-tcp-stream.c	Wed Jul 23 03:06:32 2008
@@ -97,7 +97,7 @@
  *
  * Create a socket and connect based upon the data provided.
  *
- * Returns %0 on success or %-1 on fail
+ * Returns: %0 on success or %-1 on fail
  **/
 int
 camel_tcp_stream_connect (CamelTcpStream *stream, struct addrinfo *host)
@@ -121,7 +121,7 @@
  *
  * Get the socket options set on the stream and populate @data.
  *
- * Returns %0 on success or %-1 on fail
+ * Returns: %0 on success or %-1 on fail
  **/
 int
 camel_tcp_stream_getsockopt (CamelTcpStream *stream, CamelSockOptData *data)
@@ -145,7 +145,7 @@
  *
  * Set the socket options contained in @data on the stream.
  *
- * Returns %0 on success or %-1 on fail
+ * Returns: %0 on success or %-1 on fail
  **/
 int
 camel_tcp_stream_setsockopt (CamelTcpStream *stream, const CamelSockOptData *data)
@@ -169,7 +169,7 @@
  *
  * Get the local address of @stream.
  *
- * Returns the stream's local address (which must be freed with
+ * Returns: the stream's local address (which must be freed with
  * #g_free) if the stream is connected, or %NULL if not
  **/
 struct sockaddr *
@@ -195,7 +195,7 @@
  *
  * Get the remote address of @stream.
  *
- * Returns the stream's remote address (which must be freed with
+ * Returns: the stream's remote address (which must be freed with
  * #g_free) if the stream is connected, or %NULL if not.
  **/
 struct sockaddr *

Modified: trunk/camel/camel-url.c
==============================================================================
--- trunk/camel/camel-url.c	(original)
+++ trunk/camel/camel-url.c	Wed Jul 23 03:06:32 2008
@@ -53,7 +53,7 @@
  *
  * Parses @url_string relative to @base.
  *
- * Returns a parsed #CamelURL
+ * Returns: a parsed #CamelURL
  **/
 CamelURL *
 camel_url_new_with_base (CamelURL *base, const char *url_string)
@@ -295,7 +295,7 @@
  *
  * Parses an absolute URL.
  *
- * Returns a #CamelURL if it can be parsed, or %NULL otherwise
+ * Returns: a #CamelURL if it can be parsed, or %NULL otherwise
  **/
 CamelURL *
 camel_url_new (const char *url_string, CamelException *ex)
@@ -324,7 +324,7 @@
  *
  * Flatten a #CamelURL into a string.
  *
- * Returns a string representing @url, which the caller must free
+ * Returns: a string representing @url, which the caller must free
  **/
 char *
 camel_url_to_string (CamelURL *url, guint32 flags)
@@ -566,7 +566,7 @@
  *
  * Get the value of the specified param on the URL.
  *
- * Returns the value of a param if found or %NULL otherwise
+ * Returns: the value of a param if found or %NULL otherwise
  **/
 const char *
 camel_url_get_param (CamelURL *url, const char *name)
@@ -619,7 +619,7 @@
  * This %-encodes the given URL part and returns the escaped version
  * in allocated memory, which the caller must free when it is done.
  *
- * Returns the encoded string
+ * Returns: the encoded string
  **/
 char *
 camel_url_encode (const char *part, const char *escape_extra)
@@ -721,7 +721,7 @@
  *
  * Copy a #CamelURL.
  *
- * Returns a duplicate copy of @in
+ * Returns: a duplicate copy of @in
  **/
 CamelURL *
 camel_url_copy(const CamelURL *in)

Modified: trunk/camel/camel-vee-folder.c
==============================================================================
--- trunk/camel/camel-vee-folder.c	(original)
+++ trunk/camel/camel-vee-folder.c	Wed Jul 23 03:06:32 2008
@@ -120,7 +120,7 @@
  * camel_vee_folder_new:
  * @parent_store: the parent CamelVeeStore
  * @full: the full path to the vfolder.
- * @ex: a CamelException
+ * @flags: flags of some kind
  *
  * Create a new CamelVeeFolder object.
  *

Modified: trunk/camel/camel-vee-folder.h
==============================================================================
--- trunk/camel/camel-vee-folder.h	(original)
+++ trunk/camel/camel-vee-folder.h	Wed Jul 23 03:06:32 2008
@@ -73,7 +73,7 @@
 #define CAMEL_UNMATCHED_NAME "UNMATCHED"
 
 CamelType	      camel_vee_folder_get_type		(void);
-CamelFolder  *camel_vee_folder_new		(CamelStore *parent_store, const char *name, guint32 flags);
+CamelFolder  *camel_vee_folder_new		(CamelStore *parent_store, const char *full, guint32 flags);
 void         camel_vee_folder_construct		(CamelVeeFolder *vf, CamelStore *parent_store, const char *full, const char *name, guint32 flags);
 
 CamelFolder *camel_vee_folder_get_location(CamelVeeFolder *vf, const struct _CamelVeeMessageInfo *vinfo, char **realuid);

Modified: trunk/camel/camel-vee-store.c
==============================================================================
--- trunk/camel/camel-vee-store.c	(original)
+++ trunk/camel/camel-vee-store.c	Wed Jul 23 03:06:32 2008
@@ -137,7 +137,7 @@
  *
  * Create a new #CamelVeeStore object.
  * 
- * Returns new #CamelVeeStore object
+ * Returns: new #CamelVeeStore object
  **/
 CamelVeeStore *
 camel_vee_store_new (void)

Modified: trunk/camel/camel-vtrash-folder.c
==============================================================================
--- trunk/camel/camel-vtrash-folder.c	(original)
+++ trunk/camel/camel-vtrash-folder.c	Wed Jul 23 03:06:32 2008
@@ -88,12 +88,12 @@
 /**
  * camel_vtrash_folder_new:
  * @parent_store: the parent #CamelVeeStore object
- * @type: type of vfolder, #CAMEL_VTRASH_FOLDER_TRASH or #CAMEL_VTRASH_FOLDER_JUNK currently.
- * @ex: a #CamelException
+ * @type: type of vfolder, #CAMEL_VTRASH_FOLDER_TRASH or
+ * #CAMEL_VTRASH_FOLDER_JUNK currently.
  *
  * Create a new CamelVTrashFolder object.
  *
- * Returns a new #CamelVTrashFolder object
+ * Returns: a new #CamelVTrashFolder object
  **/
 CamelFolder *
 camel_vtrash_folder_new (CamelStore *parent_store, camel_vtrash_folder_t type)

Modified: trunk/camel/camel-vtrash-folder.h
==============================================================================
--- trunk/camel/camel-vtrash-folder.h	(original)
+++ trunk/camel/camel-vtrash-folder.h	Wed Jul 23 03:06:32 2008
@@ -39,7 +39,7 @@
 #define CAMEL_VTRASH_NAME ".#evolution/Trash"
 #define CAMEL_VJUNK_NAME ".#evolution/Junk"
 
-typedef enum _camel_vtrash_folder_t {
+typedef enum {
 	CAMEL_VTRASH_FOLDER_TRASH,
 	CAMEL_VTRASH_FOLDER_JUNK,
 	CAMEL_VTRASH_FOLDER_LAST
@@ -48,7 +48,7 @@
 struct _CamelVTrashFolder {
 	CamelVeeFolder parent;
 
-	enum _camel_vtrash_folder_t type;
+	camel_vtrash_folder_t type;
 	guint32 bit;
 };
 

Modified: trunk/camel/providers/imap/camel-imap-command.h
==============================================================================
--- trunk/camel/providers/imap/camel-imap-command.h	(original)
+++ trunk/camel/providers/imap/camel-imap-command.h	Wed Jul 23 03:06:32 2008
@@ -71,7 +71,7 @@
 						    CamelException *ex,
 						    const char *fmt, ...);
 CamelImapResponseType camel_imap_command_response  (CamelImapStore *store,
-						    char **respbuf,
+						    char **response,
 						    CamelException *ex);
 
 G_END_DECLS

Modified: trunk/camel/providers/imap/camel-imap-folder.h
==============================================================================
--- trunk/camel/providers/imap/camel-imap-folder.h	(original)
+++ trunk/camel/providers/imap/camel-imap-folder.h	Wed Jul 23 03:06:32 2008
@@ -47,10 +47,13 @@
 	CAMEL_IMAP_FOLDER_CHECK_FOLDER = CAMEL_IMAP_FOLDER_ARG_CHECK_FOLDER | CAMEL_ARG_BOO,
 };
 
+typedef struct _CamelImapFolderClass CamelImapFolderClass;
+typedef struct _CamelImapFolderPrivate CamelImapFolderPrivate;
+
 struct _CamelImapFolder {
 	CamelDiscoFolder parent_object;
 
-	struct _CamelImapFolderPrivate *priv;
+	CamelImapFolderPrivate *priv;
 
 	CamelFolderSearch *search;
 	CamelImapMessageCache *cache;
@@ -61,12 +64,12 @@
 	unsigned int check_folder:1;
 };
 
-typedef struct {
+struct _CamelImapFolderClass {
 	CamelDiscoFolderClass parent_class;
 
 	/* Virtual methods */	
 	
-} CamelImapFolderClass;
+};
 
 
 /* public methods */

Modified: trunk/camel/providers/imap/camel-imap-message-cache.h
==============================================================================
--- trunk/camel/providers/imap/camel-imap-message-cache.h	(original)
+++ trunk/camel/providers/imap/camel-imap-message-cache.h	Wed Jul 23 03:06:32 2008
@@ -56,7 +56,7 @@
 
 /* public methods */
 CamelImapMessageCache *camel_imap_message_cache_new (const char *path,
-						     CamelFolderSummary *summ,
+						     CamelFolderSummary *summary,
 						     CamelException *ex);
 
 void camel_imap_message_cache_set_path (CamelImapMessageCache *cache,

Modified: trunk/camel/providers/imap/camel-imap-store-summary.c
==============================================================================
--- trunk/camel/providers/imap/camel-imap-store-summary.c	(original)
+++ trunk/camel/providers/imap/camel-imap-store-summary.c	Wed Jul 23 03:06:32 2008
@@ -141,7 +141,7 @@
 /**
  * camel_imap_store_summary_full_name:
  * @s: 
- * @path: 
+ * @full_name: 
  * 
  * Retrieve a summary item by full name.
  *

Modified: trunk/camel/providers/imap/camel-imap-types.h
==============================================================================
--- trunk/camel/providers/imap/camel-imap-types.h	(original)
+++ trunk/camel/providers/imap/camel-imap-types.h	Wed Jul 23 03:06:32 2008
@@ -32,6 +32,7 @@
 typedef struct _CamelImapSearch       CamelImapSearch;
 typedef struct _CamelImapStore        CamelImapStore;
 typedef struct _CamelImapSummary      CamelImapSummary;
+typedef struct _CamelImapWrapper      CamelImapWrapper;
 
 G_END_DECLS
 

Modified: trunk/camel/providers/imap/camel-imap-wrapper.h
==============================================================================
--- trunk/camel/providers/imap/camel-imap-wrapper.h	(original)
+++ trunk/camel/providers/imap/camel-imap-wrapper.h	Wed Jul 23 03:06:32 2008
@@ -33,20 +33,22 @@
 
 G_BEGIN_DECLS
 
-typedef struct {
+typedef struct _CamelImapWrapperClass CamelImapWrapperClass;
+typedef struct _CamelImapWrapperPrivate CamelImapWrapperPrivate;
+
+struct _CamelImapWrapper {
 	CamelDataWrapper parent_object;
 
-	struct _CamelImapWrapperPrivate *priv;
+	CamelImapWrapperPrivate *priv;
 
 	CamelImapFolder *folder;
 	char *uid, *part_spec;
 	CamelMimePart *part;
-} CamelImapWrapper;
+};
 
-typedef struct {
+struct _CamelImapWrapperClass {
 	CamelDataWrapperClass parent_class;
-
-} CamelImapWrapperClass;
+};
 
 /* Standard Camel function */
 CamelType camel_imap_wrapper_get_type (void);

Modified: trunk/camel/providers/imap4/camel-imap4-engine.c
==============================================================================
--- trunk/camel/providers/imap4/camel-imap4-engine.c	(original)
+++ trunk/camel/providers/imap4/camel-imap4-engine.c	Wed Jul 23 03:06:32 2008
@@ -155,7 +155,7 @@
  * @service: service
  * @reconnect: reconnect callback function
  *
- * Returns a new imap4 engine
+ * Returns: a new imap4 engine
  **/
 CamelIMAP4Engine *
 camel_imap4_engine_new (CamelService *service, CamelIMAP4ReconnectFunc reconnect)
@@ -183,7 +183,7 @@
  * Gives ownership of @stream to @engine and reads the greeting from
  * the stream.
  *
- * Returns 0 on success or -1 on fail.
+ * Returns: 0 on success or -1 on fail.
  *
  * Note: on error, @stream will be unref'd.
  **/
@@ -264,7 +264,7 @@
  *
  * Forces the IMAP4 engine to query the IMAP4 server for a list of capabilities.
  *
- * Returns %0 on success or %-1 on fail.
+ * Returns: %0 on success or %-1 on fail.
  **/
 int
 camel_imap4_engine_capability (CamelIMAP4Engine *engine, CamelException *ex)
@@ -311,7 +311,7 @@
  *
  * Forces the IMAP4 engine to query the IMAP4 server for a list of namespaces.
  *
- * Returns 0 on success or -1 on fail.
+ * Returns: 0 on success or -1 on fail.
  **/
 int
 camel_imap4_engine_namespace (CamelIMAP4Engine *engine, CamelException *ex)
@@ -382,7 +382,7 @@
  *
  * Convenience function to select @folder.
  *
- * Returns 0 on success or -1 on fail.
+ * Returns: 0 on success or -1 on fail.
  **/
 int
 camel_imap4_engine_select_folder (CamelIMAP4Engine *engine, CamelFolder *folder, CamelException *ex)
@@ -817,7 +817,7 @@
  *
  * Parses a RESP-CODE
  *
- * Returns 0 on success or -1 on fail.
+ * Returns: 0 on success or -1 on fail.
  **/
 int
 camel_imap4_engine_parse_resp_code (CamelIMAP4Engine *engine, CamelException *ex)
@@ -1084,7 +1084,7 @@
  *
  * Handles a single untagged response
  *
- * Returns -1 on error or one of
+ * Returns: -1 on error or one of
  * CAMEL_IMAP4_UNTAGGED_[OK,NO,BAD,PREAUTH,HANDLED] on success
  **/
 int
@@ -1351,7 +1351,7 @@
  *
  * Processes the first command in the queue.
  *
- * Returns the id of the processed command, %0 if there were no
+ * Returns: the id of the processed command, %0 if there were no
  * commands to process, or %-1 on error.
  *
  * Note: more details on the error will be held on the
@@ -1451,7 +1451,7 @@
  * Basically the same as camel_imap4_command_new() except that this
  * function also places the command in the engine queue.
  *
- * Returns the CamelIMAP4Command.
+ * Returns: the CamelIMAP4Command.
  **/
 CamelIMAP4Command *
 camel_imap4_engine_queue (CamelIMAP4Engine *engine, CamelFolder *folder, const char *format, ...)
@@ -1483,7 +1483,7 @@
  * Same as camel_imap4_engine_queue() except this places the new
  * command at the head of the queue.
  *
- * Returns the CamelIMAP4Command.
+ * Returns: the CamelIMAP4Command.
  **/
 CamelIMAP4Command *
 camel_imap4_engine_prequeue (CamelIMAP4Engine *engine, CamelFolder *folder, const char *format, ...)
@@ -1559,7 +1559,7 @@
  * failure and updates the engine state to DISCONNECTED if the stream
  * gets disconencted.
  *
- * Returns %0 on success or %-1 on fail.
+ * Returns: %0 on success or %-1 on fail.
  **/
 int
 camel_imap4_engine_next_token (CamelIMAP4Engine *engine, camel_imap4_token_t *token, CamelException *ex)
@@ -1585,7 +1585,7 @@
  *
  * Gobbles up the remainder of the response line.
  *
- * Returns 0 on success or -1 on fail
+ * Returns: 0 on success or -1 on fail
  **/
 int
 camel_imap4_engine_eat_line (CamelIMAP4Engine *engine, CamelException *ex)
@@ -1630,7 +1630,7 @@
  * @line to point to the line buffer. @len is set to the length of the
  * line buffer. @line must be free'd using g_free().
  *
- * Returns 0 on success or -1 on fail
+ * Returns: 0 on success or -1 on fail
  **/
 int
 camel_imap4_engine_line (CamelIMAP4Engine *engine, unsigned char **line, size_t *len, CamelException *ex)
@@ -1686,7 +1686,7 @@
  * conveniently be terminated with a nul-byte. @literal must be free'd
  * using g_free().
  *
- * Returns 0 on success or -1 on fail.
+ * Returns: 0 on success or -1 on fail.
  **/
 int
 camel_imap4_engine_literal (CamelIMAP4Engine *engine, unsigned char **literal, size_t *len, CamelException *ex)
@@ -1740,7 +1740,7 @@
  * Reads in an nstring (NIL, atom, qstring or literal) and updates
  * @nstring to point to it. @nstring must be free'd using g_free().
  *
- * Returns 0 on success or -1 on fail.
+ * Returns: 0 on success or -1 on fail.
  **/
 int
 camel_imap4_engine_nstring (CamelIMAP4Engine *engine, unsigned char **nstring, CamelException *ex)

Modified: trunk/camel/providers/imap4/camel-imap4-store-summary.c
==============================================================================
--- trunk/camel/providers/imap4/camel-imap4-store-summary.c	(original)
+++ trunk/camel/providers/imap4/camel-imap4-store-summary.c	Wed Jul 23 03:06:32 2008
@@ -281,7 +281,7 @@
  *
  * Create a new CamelIMAP4StoreSummary object.
  * 
- * Returns a new CamelIMAP4StoreSummary object.
+ * Returns: a new CamelIMAP4StoreSummary object.
  **/
 CamelIMAP4StoreSummary *
 camel_imap4_store_summary_new (void)

Modified: trunk/camel/providers/imap4/camel-imap4-stream.c
==============================================================================
--- trunk/camel/providers/imap4/camel-imap4-stream.c	(original)
+++ trunk/camel/providers/imap4/camel-imap4-stream.c	Wed Jul 23 03:06:32 2008
@@ -273,7 +273,7 @@
  * camel_imap4_stream_new:
  * @stream: tcp stream
  *
- * Returns a new imap4 stream
+ * Returns: a new imap4 stream
  **/
 CamelStream *
 camel_imap4_stream_new (CamelStream *stream)
@@ -325,7 +325,7 @@
  *
  * Reads the next token from the imap4 stream and saves it in @token.
  *
- * Returns 0 on success or -1 on fail.
+ * Returns: 0 on success or -1 on fail.
  **/
 int
 camel_imap4_stream_next_token (CamelIMAP4Stream *stream, camel_imap4_token_t *token)
@@ -598,7 +598,7 @@
  * Note: you may *ONLY* unget a single token. Trying to unget another
  * token will fail.
  *
- * Returns 0 on success or -1 on fail.
+ * Returns: 0 on success or -1 on fail.
  **/
 int
 camel_imap4_stream_unget_token (CamelIMAP4Stream *stream, camel_imap4_token_t *token)
@@ -625,7 +625,7 @@
  * internal buffer containing the line read and sets @len to the
  * length of the line buffer.
  *
- * Returns -1 on error, 0 if the line read is complete, or 1 if the
+ * Returns: -1 on error, 0 if the line read is complete, or 1 if the
  * read is incomplete.
  **/
 int
@@ -687,7 +687,7 @@
  * buffer from the IMAP stream and sets @len to the length of the
  * @literal buffer.
  *
- * Returns >0 if more literal data exists, 0 if the end of the literal
+ * Returns: >0 if more literal data exists, 0 if the end of the literal
  * has been reached or -1 on fail.
  **/
 int

Modified: trunk/camel/providers/imap4/camel-imap4-utils.c
==============================================================================
--- trunk/camel/providers/imap4/camel-imap4-utils.c	(original)
+++ trunk/camel/providers/imap4/camel-imap4-utils.c	Wed Jul 23 03:06:32 2008
@@ -134,7 +134,7 @@
  *
  * Merge the local flag changes into the new server flags.
  *
- * Returns the merged flags.
+ * Returns: the merged flags.
  **/
 guint32
 camel_imap4_merge_flags (guint32 original, guint32 local, guint32 server)

Modified: trunk/camel/providers/imapp/camel-imapp-store-summary.c
==============================================================================
--- trunk/camel/providers/imapp/camel-imapp-store-summary.c	(original)
+++ trunk/camel/providers/imapp/camel-imapp-store-summary.c	Wed Jul 23 03:06:32 2008
@@ -138,7 +138,7 @@
 /**
  * camel_imapp_store_summary_full_name:
  * @s: 
- * @path: 
+ * @full_name: 
  * 
  * Retrieve a summary item by full name.
  *

Modified: trunk/camel/providers/imapp/camel-imapp-summary.c
==============================================================================
--- trunk/camel/providers/imapp/camel-imapp-summary.c	(original)
+++ trunk/camel/providers/imapp/camel-imapp-summary.c	Wed Jul 23 03:06:32 2008
@@ -96,7 +96,6 @@
 
 /**
  * camel_imapp_summary_new:
- * @filename: the file to store the summary in.
  *
  * This will create a new CamelIMAPPSummary object and read in the
  * summary data from disk, if it exists.

Modified: trunk/camel/providers/imapp/camel-imapp-utils.h
==============================================================================
--- trunk/camel/providers/imapp/camel-imapp-utils.h	(original)
+++ trunk/camel/providers/imapp/camel-imapp-utils.h	Wed Jul 23 03:06:32 2008
@@ -46,17 +46,17 @@
 };
 
 /* ********************************************************************** */
-void imap_parse_flags(CamelIMAPPStream *stream, guint32 *flagsp) /* IO,PARSE */;
-void imap_write_flags(CamelStream *stream, guint32 flags) /* IO */;
+void imap_parse_flags(CamelIMAPPStream *stream, guint32 *flagsp); /* IO,PARSE */
+void imap_write_flags(CamelStream *stream, guint32 flags); /* IO */
 
 /* ********************************************************************** */
-void imap_parse_param_list(CamelIMAPPStream *is, struct _camel_header_param **plist) /* IO,PARSE */;
-struct _CamelContentDisposition *imap_parse_ext_optional(CamelIMAPPStream *is) /* IO,PARSE */;
-struct _CamelMessageContentInfo *imap_parse_body_fields(CamelIMAPPStream *is) /* IO,PARSE */;
-struct _camel_header_address *imap_parse_address_list(CamelIMAPPStream *is) /* IO,PARSE */;
-struct _CamelMessageInfo *imap_parse_envelope(CamelIMAPPStream *is) /* IO, PARSE */;
-struct _CamelMessageContentInfo *imap_parse_body(CamelIMAPPStream *is) /* IO,PARSE */;
-char *imap_parse_section(CamelIMAPPStream *is) /* IO,PARSE */;
+void imap_parse_param_list(CamelIMAPPStream *is, struct _camel_header_param **plist); /* IO,PARSE */
+struct _CamelContentDisposition *imap_parse_ext_optional(CamelIMAPPStream *is); /* IO,PARSE */
+struct _CamelMessageContentInfo *imap_parse_body_fields(CamelIMAPPStream *is); /* IO,PARSE */
+struct _camel_header_address *imap_parse_address_list(CamelIMAPPStream *is); /* IO,PARSE */
+struct _CamelMessageInfo *imap_parse_envelope(CamelIMAPPStream *is); /* IO, PARSE */
+struct _CamelMessageContentInfo *imap_parse_body(CamelIMAPPStream *is); /* IO,PARSE */
+char *imap_parse_section(CamelIMAPPStream *is); /* IO,PARSE */
 void imap_free_body(struct _CamelMessageContentInfo *cinfo);
 
 /* ********************************************************************** */

Modified: trunk/camel/providers/local/camel-local-folder.h
==============================================================================
--- trunk/camel/providers/local/camel-local-folder.h	(original)
+++ trunk/camel/providers/local/camel-local-folder.h	Wed Jul 23 03:06:32 2008
@@ -47,9 +47,13 @@
 	CAMEL_LOCAL_FOLDER_INDEX_BODY = CAMEL_LOCAL_FOLDER_ARG_INDEX_BODY | CAMEL_ARG_BOO
 };
 
-typedef struct {
+typedef struct _CamelLocalFolder CamelLocalFolder;
+typedef struct _CamelLocalFolderClass CamelLocalFolderClass;
+typedef struct _CamelLocalFolderPrivate CamelLocalFolderPrivate;
+
+struct _CamelLocalFolder {
 	CamelFolder parent_object;
-	struct _CamelLocalFolderPrivate *priv;
+	CamelLocalFolderPrivate *priv;
 
 	guint32 flags;		/* open mode flags */
 
@@ -64,9 +68,9 @@
 	CamelIndex *index;	   /* index for this folder */
 	CamelFolderSearch *search; /* used to run searches, we just use the real thing (tm) */
 	CamelFolderChangeInfo *changes;	/* used to store changes to the folder during processing */
-} CamelLocalFolder;
+};
 
-typedef struct {
+struct _CamelLocalFolderClass {
 	CamelFolderClass parent_class;
 
 	/* Virtual methods */	
@@ -79,7 +83,7 @@
 
 	/* Unlock the folder for my operations */
 	void (*unlock)(CamelLocalFolder *);
-} CamelLocalFolderClass;
+};
 
 
 /* public methods */

Modified: trunk/camel/providers/nntp/camel-nntp-folder.h
==============================================================================
--- trunk/camel/providers/nntp/camel-nntp-folder.h	(original)
+++ trunk/camel/providers/nntp/camel-nntp-folder.h	Wed Jul 23 03:06:32 2008
@@ -38,22 +38,23 @@
 
 G_BEGIN_DECLS
 
-typedef struct _CamelNNTPFolder {
+typedef struct _CamelNNTPFolder CamelNNTPFolder;
+typedef struct _CamelNNTPFolderClass CamelNNTPFolderClass;
+typedef struct _CamelNNTPFolderPrivate CamelNNTPFolderPrivate;
+
+struct _CamelNNTPFolder {
 	CamelDiscoFolder parent;
 
-	struct _CamelNNTPFolderPrivate *priv;
+	CamelNNTPFolderPrivate *priv;
 
 	struct _CamelFolderChangeInfo *changes;
 	char *storage_path;
 	CamelFolderSearch *search;
-} CamelNNTPFolder;
+};
 
-typedef struct _CamelNNTPFolderClass {
+struct _CamelNNTPFolderClass {
 	CamelDiscoFolderClass parent;
-
-	/* Virtual methods */	
-	
-} CamelNNTPFolderClass;
+};
 
 /* public methods */
 

Modified: trunk/camel/providers/nntp/camel-nntp-store-summary.c
==============================================================================
--- trunk/camel/providers/nntp/camel-nntp-store-summary.c	(original)
+++ trunk/camel/providers/nntp/camel-nntp-store-summary.c	Wed Jul 23 03:06:32 2008
@@ -138,7 +138,7 @@
 /**
  * camel_nntp_store_summary_full_name:
  * @s:
- * @path:
+ * @full_name:
  *
  * Retrieve a summary item by full name.
  *

Modified: trunk/camel/providers/nntp/camel-nntp-store.h
==============================================================================
--- trunk/camel/providers/nntp/camel-nntp-store.h	(original)
+++ trunk/camel/providers/nntp/camel-nntp-store.h	Wed Jul 23 03:06:32 2008
@@ -50,6 +50,7 @@
 
 typedef struct _CamelNNTPStore CamelNNTPStore;
 typedef struct _CamelNNTPStoreClass CamelNNTPStoreClass;
+typedef struct _CamelNNTPStorePrivate CamelNNTPStorePrivate;
 
 typedef enum _xover_t {
 	XOVER_STRING = 0,
@@ -68,7 +69,7 @@
 struct _CamelNNTPStore {
 	CamelDiscoStore parent_object;	
 	
-	struct _CamelNNTPStorePrivate *priv;
+	CamelNNTPStorePrivate *priv;
 	
 	guint32 extensions;
 	

Modified: trunk/docs/reference/camel/camel-sections.txt
==============================================================================
--- trunk/docs/reference/camel/camel-sections.txt	(original)
+++ trunk/docs/reference/camel/camel-sections.txt	Wed Jul 23 03:06:32 2008
@@ -191,6 +191,59 @@
 </SECTION>
 
 <SECTION>
+<FILE>camel-db</FILE>
+<TITLE>CamelDB</TITLE>
+CAMEL_DB_FILE
+CAMEL_DB_FREE_CACHE_SIZE
+CAMEL_DB_SLEEP_INTERVAL
+CAMEL_DB_RELEASE_SQLITE_MEMORY
+CAMEL_DB_USE_SHARED_CACHE
+CamelDB
+CamelMIRecord
+CamelFIRecord
+CamelDBSelectCB
+camel_db_open
+camel_db_close
+camel_db_command
+camel_db_transaction_command
+camel_db_begin_transaction
+camel_db_add_to_transaction
+camel_db_end_transaction
+camel_db_abort_transaction
+camel_db_clear_folder_summary
+camel_db_delete_folder
+camel_db_delete_uid
+camel_db_delete_uids
+camel_db_create_folders_table
+camel_db_select
+camel_db_write_folder_info_record
+camel_db_read_folder_info_record
+camel_db_prepare_message_info_table
+camel_db_write_message_info_record
+camel_db_read_message_info_records
+camel_db_read_message_info_record_with_uid
+camel_db_count_junk_message_info
+camel_db_count_unread_message_info
+camel_db_count_deleted_message_info
+camel_db_count_total_message_info
+camel_db_count_visible_message_info
+camel_db_count_visible_unread_message_info
+camel_db_count_junk_not_deleted_message_info
+camel_db_camel_mir_free
+camel_db_create_vfolder
+camel_db_delete_uid_from_vfolder
+camel_db_get_vuids_from_vfolder
+camel_db_add_to_vfolder
+camel_db_add_to_vfolder_transaction
+camel_db_get_folder_uids
+camel_db_get_folder_junk_uids
+camel_db_get_folder_deleted_uids
+camel_db_sqlize_string
+camel_db_free_sqlized_string
+camel_db_get_column_name
+</SECTION>
+
+<SECTION>
 <FILE>camel-digest-folder</FILE>
 <TITLE>CamelDigestFolder</TITLE>
 CamelDigestFolder
@@ -341,6 +394,7 @@
 camel_folder_delete_message
 camel_folder_get_uids
 camel_folder_free_uids
+camel_folder_sort_uids
 camel_folder_has_search_capability
 camel_folder_search_by_expression
 camel_folder_search_by_uids
@@ -431,9 +485,17 @@
 camel_folder_summary_set_uid
 camel_folder_summary_load
 camel_folder_summary_save
+camel_folder_summary_save_to_db
+camel_folder_summary_load_from_db
 camel_folder_summary_header_load
+camel_folder_summary_header_load_from_db
 camel_folder_summary_touch
 camel_folder_summary_add
+camel_folder_summary_get_changed
+camel_folder_summary_cache_size
+camel_folder_summary_reload_from_db
+camel_folder_summary_insert
+camel_folder_summary_remove_index_fast
 camel_folder_summary_add_from_header
 camel_folder_summary_add_from_parser
 camel_folder_summary_add_from_message
@@ -447,11 +509,12 @@
 camel_folder_summary_remove_index
 camel_folder_summary_remove_range
 camel_folder_summary_clear
+camel_folder_summary_clear_db
 camel_folder_summary_count
 camel_folder_summary_index
 camel_folder_summary_uid
+camel_folder_summary_uid_from_index
 camel_folder_summary_array
-camel_folder_summary_array_free
 camel_folder_summary_encode_token
 camel_folder_summary_decode_token
 camel_flag_get
@@ -496,6 +559,7 @@
 camel_message_info_set_user_tag
 camel_content_info_dump
 camel_message_info_dump
+camel_folder_summary_migrate_infos
 <SUBSECTION Standard>
 CAMEL_FOLDER_SUMMARY
 CAMEL_IS_FOLDER_SUMMARY
@@ -2049,6 +2113,7 @@
 CamelVeeMessageInfo
 camel_vee_summary_new
 camel_vee_summary_add
+camel_vee_summary_get_ids
 <SUBSECTION Standard>
 CAMEL_VEE_SUMMARY
 CAMEL_IS_VEE_SUMMARY
@@ -3929,6 +3994,14 @@
 camel_imapp_id_t
 imap_tokenise
 imap_parse_flags
+imap_write_flags
+imap_parse_param_list
+imap_parse_ext_optional
+imap_parse_body_fields
+imap_parse_address_list
+imap_parse_envelope
+imap_parse_section
+imap_free_body
 fetch_info
 FETCH_BODY
 FETCH_TEXT

Modified: trunk/docs/reference/camel/tmpl/camel-cipher-context.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-cipher-context.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-cipher-context.sgml	Wed Jul 23 03:06:32 2008
@@ -287,8 +287,8 @@
 
 </para>
 
+ parent: 
 @valid: 
- outer: 
 
 
 <!-- ##### FUNCTION camel_cipher_validity_free ##### -->

Modified: trunk/docs/reference/camel/tmpl/camel-data-cache.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-data-cache.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-data-cache.sgml	Wed Jul 23 03:06:32 2008
@@ -45,7 +45,7 @@
 
 </para>
 
- cache: 
+ cdc: 
 @when: 
 
 
@@ -75,7 +75,7 @@
 
 </para>
 
- cache: 
+ cdc: 
 @path: 
 @key: 
 @ex: 
@@ -87,7 +87,7 @@
 
 </para>
 
- cache: 
+ cdc: 
 @path: 
 @key: 
 @ex: 
@@ -99,7 +99,7 @@
 
 </para>
 
- cache: 
+ cdc: 
 @path: 
 @key: 
 @ex: 

Modified: trunk/docs/reference/camel/tmpl/camel-disco-store.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-disco-store.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-disco-store.sgml	Wed Jul 23 03:06:32 2008
@@ -40,7 +40,7 @@
 
 </para>
 
- Param1: 
+ store: 
 @Returns: 
 
 
@@ -49,9 +49,9 @@
 
 </para>
 
- Param1: 
- Param2: 
- Param3: 
+ store: 
+ status: 
+ ex: 
 
 
 <!-- ##### FUNCTION camel_disco_store_can_work_offline ##### -->
@@ -59,7 +59,7 @@
 
 </para>
 
- Param1: 
+ store: 
 @Returns: 
 
 

Modified: trunk/docs/reference/camel/tmpl/camel-file-utils.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-file-utils.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-file-utils.sgml	Wed Jul 23 03:06:32 2008
@@ -30,7 +30,7 @@
 </para>
 
 @out: 
- Param2: 
+ value: 
 @Returns: 
 
 
@@ -40,7 +40,7 @@
 </para>
 
 @in: 
- Param2: 
+ dest: 
 @Returns: 
 
 
@@ -50,7 +50,7 @@
 </para>
 
 @out: 
- Param2: 
+ value: 
 @Returns: 
 
 
@@ -60,7 +60,7 @@
 </para>
 
 @in: 
- Param2: 
+ dest: 
 @Returns: 
 
 
@@ -70,7 +70,7 @@
 </para>
 
 @out: 
- Param2: 
+ value: 
 @Returns: 
 
 
@@ -80,7 +80,7 @@
 </para>
 
 @in: 
- Param2: 
+ dest: 
 @Returns: 
 
 
@@ -90,7 +90,7 @@
 </para>
 
 @out: 
- Param2: 
+ value: 
 @Returns: 
 
 
@@ -100,7 +100,7 @@
 </para>
 
 @in: 
- Param2: 
+ dest: 
 @Returns: 
 
 
@@ -110,7 +110,7 @@
 </para>
 
 @out: 
- Param2: 
+ value: 
 @Returns: 
 
 
@@ -120,7 +120,7 @@
 </para>
 
 @in: 
- Param2: 
+ dest: 
 @Returns: 
 
 
@@ -130,7 +130,7 @@
 </para>
 
 @out: 
- Param2: 
+ str: 
 @Returns: 
 
 
@@ -140,7 +140,7 @@
 </para>
 
 @in: 
- Param2: 
+ str: 
 @Returns: 
 
 

Modified: trunk/docs/reference/camel/tmpl/camel-filter-driver.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-filter-driver.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-filter-driver.sgml	Wed Jul 23 03:06:32 2008
@@ -152,7 +152,7 @@
 @driver: 
 @message: 
 @info: 
- uri: 
+ uid: 
 @source: 
 @source_url: 
 @original_source_url: 

Modified: trunk/docs/reference/camel/tmpl/camel-folder-search.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-folder-search.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-folder-search.sgml	Wed Jul 23 03:06:32 2008
@@ -30,6 +30,7 @@
 @summary: 
 @summary_set: 
 @query: 
+ summary_hash: 
 @current: 
 @current_message: 
 @body_index: 

Modified: trunk/docs/reference/camel/tmpl/camel-folder-summary.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-folder-summary.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-folder-summary.sgml	Wed Jul 23 03:06:32 2008
@@ -40,6 +40,8 @@
 @content_info_chunks: 
 @summary_path: 
 @build_content: 
+ messages: 
+ messages_uid: 
 @uids: 
 @loaded_infos: 
 @folder: 
@@ -256,6 +258,26 @@
 @Returns: 
 
 
+<!-- ##### FUNCTION camel_folder_summary_save_to_db ##### -->
+<para>
+
+</para>
+
+ s: 
+ ex: 
+ Returns: 
+
+
+<!-- ##### FUNCTION camel_folder_summary_load_from_db ##### -->
+<para>
+
+</para>
+
+ s: 
+ ex: 
+ Returns: 
+
+
 <!-- ##### FUNCTION camel_folder_summary_header_load ##### -->
 <para>
 
@@ -265,6 +287,18 @@
 @Returns: 
 
 
+<!-- ##### FUNCTION camel_folder_summary_header_load_from_db ##### -->
+<para>
+
+</para>
+
+ s: 
+ store: 
+ folder_name: 
+ ex: 
+ Returns: 
+
+
 <!-- ##### FUNCTION camel_folder_summary_touch ##### -->
 <para>
 
@@ -282,6 +316,53 @@
 @info: 
 
 
+<!-- ##### FUNCTION camel_folder_summary_get_changed ##### -->
+<para>
+
+</para>
+
+ s: 
+ Returns: 
+
+
+<!-- ##### FUNCTION camel_folder_summary_cache_size ##### -->
+<para>
+
+</para>
+
+ s: 
+ Returns: 
+
+
+<!-- ##### FUNCTION camel_folder_summary_reload_from_db ##### -->
+<para>
+
+</para>
+
+ s: 
+ ex: 
+ Returns: 
+
+
+<!-- ##### FUNCTION camel_folder_summary_insert ##### -->
+<para>
+
+</para>
+
+ s: 
+ info: 
+ load: 
+
+
+<!-- ##### FUNCTION camel_folder_summary_remove_index_fast ##### -->
+<para>
+
+</para>
+
+ s: 
+ index: 
+
+
 <!-- ##### FUNCTION camel_folder_summary_add_from_header ##### -->
 <para>
 
@@ -405,6 +486,14 @@
 @summary: 
 
 
+<!-- ##### FUNCTION camel_folder_summary_clear_db ##### -->
+<para>
+
+</para>
+
+ s: 
+
+
 <!-- ##### FUNCTION camel_folder_summary_count ##### -->
 <para>
 
@@ -434,6 +523,16 @@
 @Returns: 
 
 
+<!-- ##### FUNCTION camel_folder_summary_uid_from_index ##### -->
+<para>
+
+</para>
+
+ s: 
+ i: 
+ Returns: 
+
+
 <!-- ##### FUNCTION camel_folder_summary_array ##### -->
 <para>
 
@@ -480,7 +579,7 @@
 
 @list: 
 @name: 
- state: 
+ value: 
 @Returns: 
 
 
@@ -798,7 +897,7 @@
 </para>
 
 @mi: 
- mask: 
+ flags: 
 @set: 
 @Returns: 
 
@@ -842,3 +941,12 @@
 @mi: 
 
 
+<!-- ##### FUNCTION camel_folder_summary_migrate_infos ##### -->
+<para>
+
+</para>
+
+ s: 
+ Returns: 
+
+

Modified: trunk/docs/reference/camel/tmpl/camel-folder-thread.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-folder-thread.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-folder-thread.sgml	Wed Jul 23 03:06:32 2008
@@ -94,7 +94,7 @@
 
 </para>
 
- threads: 
+ thread: 
 
 
 <!-- ##### FUNCTION camel_folder_thread_messages_unref ##### -->
@@ -102,7 +102,7 @@
 
 </para>
 
- threads: 
+ thread: 
 
 
 <!-- ##### FUNCTION camel_folder_threaded_messages_dump ##### -->

Modified: trunk/docs/reference/camel/tmpl/camel-folder.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-folder.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-folder.sgml	Wed Jul 23 03:06:32 2008
@@ -348,6 +348,15 @@
 @array: 
 
 
+<!-- ##### FUNCTION camel_folder_sort_uids ##### -->
+<para>
+
+</para>
+
+ folder: 
+ uids: 
+
+
 <!-- ##### FUNCTION camel_folder_has_search_capability ##### -->
 <para>
 

Modified: trunk/docs/reference/camel/tmpl/camel-imap-command.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-imap-command.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-imap-command.sgml	Wed Jul 23 03:06:32 2008
@@ -121,7 +121,7 @@
 </para>
 
 @store: 
- respbuf: 
+ response: 
 @ex: 
 @Returns: 
 

Modified: trunk/docs/reference/camel/tmpl/camel-imap-message-cache.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-imap-message-cache.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-imap-message-cache.sgml	Wed Jul 23 03:06:32 2008
@@ -34,7 +34,7 @@
 </para>
 
 @path: 
- summ: 
+ summary: 
 @ex: 
 @Returns: 
 

Modified: trunk/docs/reference/camel/tmpl/camel-imap-utils.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-imap-utils.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-imap-utils.sgml	Wed Jul 23 03:06:32 2008
@@ -149,9 +149,8 @@
 
 </para>
 
- body_p: 
- folder: 
- ci: 
+ is: 
+ Returns: 
 
 
 <!-- ##### FUNCTION imap_is_atom ##### -->

Modified: trunk/docs/reference/camel/tmpl/camel-imapp-utils.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-imapp-utils.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-imapp-utils.sgml	Wed Jul 23 03:06:32 2008
@@ -61,6 +61,78 @@
 </para>
 
 @stream: 
+ flagsp: 
+
+
+<!-- ##### FUNCTION imap_write_flags ##### -->
+<para>
+
+</para>
+
+ stream: 
+ flags: 
+
+
+<!-- ##### FUNCTION imap_parse_param_list ##### -->
+<para>
+
+</para>
+
+ is: 
+ plist: 
+
+
+<!-- ##### FUNCTION imap_parse_ext_optional ##### -->
+<para>
+
+</para>
+
+ is: 
+ Returns: 
+
+
+<!-- ##### FUNCTION imap_parse_body_fields ##### -->
+<para>
+
+</para>
+
+ is: 
+ Returns: 
+
+
+<!-- ##### FUNCTION imap_parse_address_list ##### -->
+<para>
+
+</para>
+
+ is: 
+ Returns: 
+
+
+<!-- ##### FUNCTION imap_parse_envelope ##### -->
+<para>
+
+</para>
+
+ is: 
+ Returns: 
+
+
+<!-- ##### FUNCTION imap_parse_section ##### -->
+<para>
+
+</para>
+
+ is: 
+ Returns: 
+
+
+<!-- ##### FUNCTION imap_free_body ##### -->
+<para>
+
+</para>
+
+ cinfo: 
 
 
 <!-- ##### STRUCT fetch_info ##### -->

Modified: trunk/docs/reference/camel/tmpl/camel-internet-address.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-internet-address.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-internet-address.sgml	Wed Jul 23 03:06:32 2008
@@ -94,7 +94,7 @@
 
 </para>
 
- real: 
+ name: 
 @addr: 
 @Returns: 
 

Modified: trunk/docs/reference/camel/tmpl/camel-mime-parser.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-mime-parser.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-mime-parser.sgml	Wed Jul 23 03:06:32 2008
@@ -69,7 +69,7 @@
 
 </para>
 
- parser: 
+ m: 
 @fd: 
 @Returns: 
 
@@ -79,7 +79,7 @@
 
 </para>
 
- parser: 
+ m: 
 @stream: 
 @Returns: 
 
@@ -136,8 +136,8 @@
 </para>
 
 @parser: 
- buf: 
- buflen: 
+ databuffer: 
+ datalength: 
 @Returns: 
 
 
@@ -201,7 +201,7 @@
 
 </para>
 
- parser: 
+ m: 
 @name: 
 @offset: 
 @Returns: 
@@ -212,7 +212,7 @@
 
 </para>
 
- parser: 
+ m: 
 @Returns: 
 
 
@@ -221,7 +221,7 @@
 
 </para>
 
- parser: 
+ m: 
 @Returns: 
 
 
@@ -230,7 +230,7 @@
 
 </para>
 
- parser: 
+ m: 
 @Returns: 
 
 
@@ -239,7 +239,7 @@
 
 </para>
 
- parser: 
+ m: 
 @Returns: 
 
 
@@ -248,8 +248,8 @@
 
 </para>
 
- parser: 
- filter: 
+ m: 
+ mf: 
 @Returns: 
 
 
@@ -258,7 +258,7 @@
 
 </para>
 
- parser: 
+ m: 
 @id: 
 
 

Modified: trunk/docs/reference/camel/tmpl/camel-mime-part.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-mime-part.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-mime-part.sgml	Wed Jul 23 03:06:32 2008
@@ -218,7 +218,7 @@
 </para>
 
 @mime_part: 
- content: 
+ data: 
 @length: 
 @type: 
 

Modified: trunk/docs/reference/camel/tmpl/camel-mime-utils.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-mime-utils.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-mime-utils.sgml	Wed Jul 23 03:06:32 2008
@@ -660,8 +660,8 @@
 
 </para>
 
- in: 
- saveoffset: 
+ str: 
+ tz_offset: 
 @Returns: 
 
 
@@ -670,8 +670,8 @@
 
 </para>
 
- time: 
- offset: 
+ date: 
+ tz_offset: 
 @Returns: 
 
 
@@ -827,7 +827,7 @@
 </para>
 
 @in: 
- len: 
+ inlen: 
 @break_lines: 
 @out: 
 @state: 
@@ -841,7 +841,7 @@
 </para>
 
 @in: 
- len: 
+ inlen: 
 @break_lines: 
 @out: 
 @state: 
@@ -855,7 +855,7 @@
 </para>
 
 @in: 
- len: 
+ inlen: 
 @out: 
 @state: 
 @save: 

Modified: trunk/docs/reference/camel/tmpl/camel-nntp-address.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-nntp-address.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-nntp-address.sgml	Wed Jul 23 03:06:32 2008
@@ -38,8 +38,8 @@
 
 </para>
 
- Param1: 
- Param2: 
+ a: 
+ name: 
 @Returns: 
 
 
@@ -48,9 +48,9 @@
 
 </para>
 
- Param1: 
- Varargs: 
- Param3: 
+ a: 
+ index: 
+ namep: 
 @Returns: 
 
 

Modified: trunk/docs/reference/camel/tmpl/camel-object.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-object.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-object.sgml	Wed Jul 23 03:06:32 2008
@@ -618,7 +618,7 @@
 
 @bag: 
 @key: 
- o: 
+ vo: 
 
 
 <!-- ##### FUNCTION camel_object_bag_abort ##### -->

Modified: trunk/docs/reference/camel/tmpl/camel-offline-folder.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-offline-folder.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-offline-folder.sgml	Wed Jul 23 03:06:32 2008
@@ -30,7 +30,7 @@
 
 </para>
 
- folder: 
+ offline: 
 @expression: 
 @ex: 
 

Modified: trunk/docs/reference/camel/tmpl/camel-store.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-store.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-store.sgml	Wed Jul 23 03:06:32 2008
@@ -360,7 +360,7 @@
 </para>
 
 @store: 
- old_name: 
+ old_namein: 
 @new_name: 
 @ex: 
 

Modified: trunk/docs/reference/camel/tmpl/camel-vee-folder.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-vee-folder.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-vee-folder.sgml	Wed Jul 23 03:06:32 2008
@@ -43,7 +43,7 @@
 </para>
 
 @parent_store: 
- name: 
+ full: 
 @flags: 
 @Returns: 
 

Modified: trunk/docs/reference/camel/tmpl/camel-vee-summary.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-vee-summary.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-vee-summary.sgml	Wed Jul 23 03:06:32 2008
@@ -53,3 +53,13 @@
 @Returns: 
 
 
+<!-- ##### FUNCTION camel_vee_summary_get_ids ##### -->
+<para>
+
+</para>
+
+ summary: 
+ hash: 
+ Returns: 
+
+

Modified: trunk/docs/reference/camel/tmpl/camel-vtrash-folder.sgml
==============================================================================
--- trunk/docs/reference/camel/tmpl/camel-vtrash-folder.sgml	(original)
+++ trunk/docs/reference/camel/tmpl/camel-vtrash-folder.sgml	Wed Jul 23 03:06:32 2008
@@ -37,6 +37,7 @@
 </para>
 
 @parent: 
+ type: 
 @bit: 
 
 <!-- ##### ENUM camel_vtrash_folder_t ##### -->



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]