[evolution-data-server/camel-gobject: 17/19] Miscellaneous cleanups.



commit 69d4ab37831e313bef3a23918cb338502f2ffb73
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Apr 3 16:00:07 2010 -0400

    Miscellaneous cleanups.

 camel/camel-cipher-context.h                       |    1 -
 camel/camel-data-cache.c                           |   44 ---------
 camel/camel-data-cache.h                           |   10 --
 camel/camel-data-wrapper.h                         |    1 -
 camel/camel-disco-diary.h                          |   36 +++----
 camel/camel-disco-folder.h                         |    2 +-
 camel/camel-filter-driver.h                        |    1 -
 camel/camel-folder-search.h                        |    1 -
 camel/camel-folder-summary.h                       |    7 +-
 camel/camel-folder.h                               |    3 -
 camel/camel-index.c                                |   14 ++--
 camel/camel-index.h                                |   97 ++++++++++----------
 camel/camel-internet-address.c                     |    2 +-
 camel/camel-internet-address.h                     |   32 +++++--
 camel/camel-medium.h                               |   53 ++++++-----
 camel/camel-mime-part-utils.h                      |    3 +-
 camel/camel-nntp-address.c                         |    2 +-
 camel/camel-nntp-address.h                         |   11 ++-
 camel/camel-operation.c                            |   53 -----------
 camel/camel-operation.h                            |    6 -
 camel/camel-sasl.h                                 |   18 ++--
 camel/camel-service.h                              |    3 -
 camel/camel-session.h                              |   15 ++--
 camel/camel-smime-context.h                        |    4 +-
 camel/camel-store-summary.h                        |    1 -
 camel/camel-store.h                                |    1 -
 camel/camel-stream-buffer.h                        |    2 -
 camel/camel-stream-process.h                       |    6 +-
 camel/camel-stream-vfs.h                           |    6 +-
 camel/camel-stream.h                               |    2 +-
 camel/camel-tcp-stream.h                           |    1 -
 camel/camel-text-index.c                           |    4 +-
 camel/camel-vee-folder.h                           |    1 -
 camel/camel-vee-store.h                            |    2 +-
 camel/camel-vee-summary.h                          |   19 +++--
 camel/camel-vtrash-folder.h                        |    7 +-
 .../providers/groupwise/camel-groupwise-summary.c  |    3 -
 camel/providers/imap/camel-imap-store.c            |    2 +-
 camel/providers/imapx/camel-imapx-store.c          |    2 +-
 docs/reference/camel/tmpl/camel-data-cache.sgml    |   23 -----
 docs/reference/camel/tmpl/camel-index.sgml         |   38 +++-----
 docs/reference/camel/tmpl/camel-mime-part.sgml     |    2 +-
 docs/reference/camel/tmpl/camel-operation.sgml     |   25 -----
 .../reference/camel/tmpl/camel-stream-process.sgml |    6 +-
 docs/reference/camel/tmpl/camel-unused.sgml        |   52 +++++++++++
 45 files changed, 255 insertions(+), 369 deletions(-)
---
diff --git a/camel/camel-cipher-context.h b/camel/camel-cipher-context.h
index 9c3fd34..cef3cc0 100644
--- a/camel/camel-cipher-context.h
+++ b/camel/camel-cipher-context.h
@@ -29,7 +29,6 @@
 
 #include <camel/camel-list-utils.h>
 #include <camel/camel-mime-part.h>
-#include <camel/camel-object.h>
 #include <camel/camel-session.h>
 
 /* Standard GObject macros */
diff --git a/camel/camel-data-cache.c b/camel/camel-data-cache.c
index c6e1c8d..7b10b0f 100644
--- a/camel/camel-data-cache.c
+++ b/camel/camel-data-cache.c
@@ -486,47 +486,3 @@ camel_data_cache_remove (CamelDataCache *cdc,
 	return ret;
 }
 
-/**
- * camel_data_cache_rename:
- * @cache:
- * @old:
- * @new:
- * @error: return location for a #GError, or %NULL
- *
- * Rename a cache path.  All cache items accessed from the old path
- * are accessible using the new path.
- *
- * CURRENTLY UNIMPLEMENTED
- *
- * Returns: -1 on error.
- **/
-gint
-camel_data_cache_rename (CamelDataCache *cache,
-                         const gchar *old,
-                         const gchar *new,
-                         GError **error)
-{
-	/* blah dont care yet */
-	return -1;
-}
-
-/**
- * camel_data_cache_clear:
- * @cache:
- * @path: Path to clear, or NULL to clear all items in all paths.
- * @error: return location for a #GError, or %NULL
- *
- * Clear all items in a given cache path or all items in the cache.
- *
- * CURRENTLY_UNIMPLEMENTED
- *
- * Returns: -1 on error.
- **/
-gint
-camel_data_cache_clear (CamelDataCache *cache,
-                        const gchar *path,
-                        GError **error)
-{
-	/* nor for this? */
-	return -1;
-}
diff --git a/camel/camel-data-cache.h b/camel/camel-data-cache.h
index 64a7f6b..559b8b0 100644
--- a/camel/camel-data-cache.h
+++ b/camel/camel-data-cache.h
@@ -91,16 +91,6 @@ gchar *		camel_data_cache_get_filename	(CamelDataCache *cdc,
 						 const gchar *key,
 						 GError **error);
 
-#ifndef CAMEL_DISABLE_DEPRECATED
-gint		camel_data_cache_rename		(CamelDataCache *cache,
-						 const gchar *old,
-						 const gchar *new,
-						 GError **error);
-gint		camel_data_cache_clear		(CamelDataCache *cache,
-						 const gchar *path,
-						 GError **error);
-#endif
-
 G_END_DECLS
 
 #endif /* CAMEL_DATA_CACHE_H */
diff --git a/camel/camel-data-wrapper.h b/camel/camel-data-wrapper.h
index 013ade4..c11f3eb 100644
--- a/camel/camel-data-wrapper.h
+++ b/camel/camel-data-wrapper.h
@@ -31,7 +31,6 @@
 
 #include <sys/types.h>
 
-#include <camel/camel-object.h>
 #include <camel/camel-mime-utils.h>
 #include <camel/camel-stream.h>
 
diff --git a/camel/camel-disco-diary.h b/camel/camel-disco-diary.h
index 3ca470d..f28351d 100644
--- a/camel/camel-disco-diary.h
+++ b/camel/camel-disco-diary.h
@@ -33,7 +33,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#include <camel/camel-object.h>
 #include <camel/camel-disco-store.h>
 
 /* Standard GObject macros */
@@ -88,27 +87,24 @@ struct _CamelDiscoDiaryClass {
 	CamelObjectClass parent_class;
 };
 
-/* public methods */
-CamelDiscoDiary *camel_disco_diary_new    (CamelDiscoStore *store,
-					   const gchar *filename,
-					   GError **error);
-
-gboolean         camel_disco_diary_empty  (CamelDiscoDiary *diary);
-
-void             camel_disco_diary_log    (CamelDiscoDiary *diary,
-					   CamelDiscoDiaryAction action,
-					   ...);
-void             camel_disco_diary_replay (CamelDiscoDiary *diary,
-					   GError **error);
+GType		camel_disco_diary_get_type	(void);
+CamelDiscoDiary *
+		camel_disco_diary_new		(CamelDiscoStore *store,
+						 const gchar *filename,
+						 GError **error);
+gboolean	camel_disco_diary_empty		(CamelDiscoDiary *diary);
+void		camel_disco_diary_log		(CamelDiscoDiary *diary,
+						 CamelDiscoDiaryAction action,
+						 ...);
+void		camel_disco_diary_replay	(CamelDiscoDiary *diary,
+						 GError **error);
 
 /* Temporary->Permanent UID map stuff */
-void        camel_disco_diary_uidmap_add    (CamelDiscoDiary *diary,
-					     const gchar *old_uid,
-					     const gchar *new_uid);
-const gchar *camel_disco_diary_uidmap_lookup (CamelDiscoDiary *diary,
-					     const gchar *uid);
-
-GType camel_disco_diary_get_type (void);
+void		camel_disco_diary_uidmap_add	(CamelDiscoDiary *diary,
+						 const gchar *old_uid,
+						 const gchar *new_uid);
+const gchar *camel_disco_diary_uidmap_lookup	(CamelDiscoDiary *diary,
+						 const gchar *uid);
 
 G_END_DECLS
 
diff --git a/camel/camel-disco-folder.h b/camel/camel-disco-folder.h
index fe17e8a..505f96d 100644
--- a/camel/camel-disco-folder.h
+++ b/camel/camel-disco-folder.h
@@ -30,7 +30,7 @@
 #ifndef CAMEL_DISCO_FOLDER_H
 #define CAMEL_DISCO_FOLDER_H
 
-#include "camel-folder.h"
+#include <camel/camel-folder.h>
 
 /* Standard GObject macros */
 #define CAMEL_TYPE_DISCO_FOLDER \
diff --git a/camel/camel-filter-driver.h b/camel/camel-filter-driver.h
index fd6a14c..a161a17 100644
--- a/camel/camel-filter-driver.h
+++ b/camel/camel-filter-driver.h
@@ -26,7 +26,6 @@
 #ifndef CAMEL_FILTER_DRIVER_H
 #define CAMEL_FILTER_DRIVER_H
 
-#include <camel/camel-object.h>
 #include <camel/camel-folder.h>
 #include <camel/camel-uid-cache.h>
 
diff --git a/camel/camel-folder-search.h b/camel/camel-folder-search.h
index 5eea9ac..4a28272 100644
--- a/camel/camel-folder-search.h
+++ b/camel/camel-folder-search.h
@@ -28,7 +28,6 @@
 
 #include <libedataserver/e-sexp.h>
 #include <camel/camel-folder.h>
-#include <camel/camel-object.h>
 #include <camel/camel-index.h>
 
 /* Standard GObject macros */
diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h
index c3db3af..b20f16c 100644
--- a/camel/camel-folder-summary.h
+++ b/camel/camel-folder-summary.h
@@ -31,7 +31,6 @@
 
 #include <camel/camel-mime-message.h>
 #include <camel/camel-mime-parser.h>
-#include <camel/camel-object.h>
 #include <camel/camel-index.h>
 
 /* Standard GObject macros */
@@ -72,10 +71,10 @@ typedef struct _CamelMessageContentInfo CamelMessageContentInfo;
 /* A tree of message content info structures
    describe the content structure of the message (if it has any) */
 struct _CamelMessageContentInfo {
-	struct _CamelMessageContentInfo *next;
+	CamelMessageContentInfo *next;
 
-	struct _CamelMessageContentInfo *childs;
-	struct _CamelMessageContentInfo *parent;
+	CamelMessageContentInfo *childs;
+	CamelMessageContentInfo *parent;
 
 	CamelContentType *type;
 	gchar *id;
diff --git a/camel/camel-folder.h b/camel/camel-folder.h
index b279900..e5f432f 100644
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.h
@@ -29,7 +29,6 @@
 #ifndef CAMEL_FOLDER_H
 #define CAMEL_FOLDER_H
 
-#include <camel/camel-object.h>
 #include <camel/camel-folder-summary.h>
 
 /* Standard GObject macros */
@@ -266,8 +265,6 @@ struct _CamelFolderClass {
 
 GType		camel_folder_get_type		(void);
 GQuark		camel_folder_error_quark	(void) G_GNUC_CONST;
-
-/* public methods */
 void		camel_folder_construct		(CamelFolder *folder,
 						 struct _CamelStore *parent_store,
 						 const gchar *full_name,
diff --git a/camel/camel-index.c b/camel/camel-index.c
index 092b5b5..1130ba7 100644
--- a/camel/camel-index.c
+++ b/camel/camel-index.c
@@ -122,12 +122,12 @@ camel_index_rename (CamelIndex *idx, const gchar *path)
 }
 
 void
-camel_index_set_normalise (CamelIndex *idx, CamelIndexNorm func, gpointer data)
+camel_index_set_normalize (CamelIndex *idx, CamelIndexNorm func, gpointer data)
 {
 	g_return_if_fail (CAMEL_IS_INDEX (idx));
 
-	idx->normalise = func;
-	idx->normalise_data = data;
+	idx->normalize = func;
+	idx->normalize_data = data;
 }
 
 gint
@@ -289,8 +289,8 @@ camel_index_find (CamelIndex *idx, const gchar *word)
 	if ((idx->state & CAMEL_INDEX_DELETED) != 0)
 		return NULL;
 
-	if (idx->normalise)
-		b = idx->normalise (idx, word, idx->normalise_data);
+	if (idx->normalize)
+		b = idx->normalize (idx, word, idx->normalize_data);
 
 	ret = class->find (idx, b);
 
@@ -389,8 +389,8 @@ camel_index_name_add_word (CamelIndexName *idn,
 	class = CAMEL_INDEX_NAME_GET_CLASS (idn);
 	g_return_if_fail (class->add_word != NULL);
 
-	if (idn->index->normalise)
-		b = idn->index->normalise (idn->index, word, idn->index->normalise_data);
+	if (idn->index->normalize)
+		b = idn->index->normalize (idn->index, word, idn->index->normalize_data);
 
 	class->add_word (idn, b);
 
diff --git a/camel/camel-index.h b/camel/camel-index.h
index 21e2a68..7be0256 100644
--- a/camel/camel-index.h
+++ b/camel/camel-index.h
@@ -96,7 +96,7 @@ typedef struct _CamelIndexCursor CamelIndexCursor;
 typedef struct _CamelIndexCursorClass CamelIndexCursorClass;
 typedef struct _CamelIndexCursorPrivate CamelIndexCursorPrivate;
 
-typedef gchar * (*CamelIndexNorm)(CamelIndex *idx, const gchar *word, gpointer data);
+typedef gchar * (*CamelIndexNorm)(CamelIndex *index, const gchar *word, gpointer data);
 
 /* ********************************************************************** */
 
@@ -116,7 +116,7 @@ struct _CamelIndexCursorClass {
 
 GType           camel_index_cursor_get_type(void);
 
-CamelIndexCursor  *camel_index_cursor_new(CamelIndex *idx, const gchar *name);
+CamelIndexCursor  *camel_index_cursor_new(CamelIndex *index, const gchar *name);
 
 const gchar        *camel_index_cursor_next(CamelIndexCursor *idc);
 void               camel_index_cursor_reset(CamelIndexCursor *idc);
@@ -145,7 +145,7 @@ struct _CamelIndexNameClass {
 
 GType           camel_index_name_get_type	(void);
 
-CamelIndexName    *camel_index_name_new(CamelIndex *idx, const gchar *name);
+CamelIndexName    *camel_index_name_new(CamelIndex *index, const gchar *name);
 
 void               camel_index_name_add_word(CamelIndexName *name, const gchar *word);
 gsize             camel_index_name_add_buffer(CamelIndexName *name, const gchar *buffer, gsize len);
@@ -161,80 +161,77 @@ struct _CamelIndex {
 	guint32 flags;		/* open flags */
 	guint32 state;
 
-	CamelIndexNorm normalise;
-	gpointer normalise_data;
+	CamelIndexNorm normalize;
+	gpointer normalize_data;
 };
 
 struct _CamelIndexClass {
 	CamelObjectClass parent_class;
 
-	gint		(*sync)			(CamelIndex *idx,
+	gint		(*sync)			(CamelIndex *index,
 						 GError **error);
-	gint		(*compress)		(CamelIndex *idx,
+	gint		(*compress)		(CamelIndex *index,
 						 GError **error);
-	gint		(*delete)		(CamelIndex *idx);
-
-	gint		(*rename)		(CamelIndex *idx,
+	gint		(*delete)		(CamelIndex *index);
+	gint		(*rename)		(CamelIndex *index,
 						 const gchar *path);
-
-	gint		(*has_name)		(CamelIndex *idx,
+	gint		(*has_name)		(CamelIndex *index,
 						 const gchar *name);
-	CamelIndexName *(*add_name)		(CamelIndex *idx,
+	CamelIndexName *(*add_name)		(CamelIndex *index,
 						 const gchar *name);
-	gint		(*write_name)		(CamelIndex *idx,
+	gint		(*write_name)		(CamelIndex *index,
 						 CamelIndexName *idn);
 	CamelIndexCursor *
-			(*find_name)		(CamelIndex *idx,
+			(*find_name)		(CamelIndex *index,
 						 const gchar *name);
-	void		(*delete_name)		(CamelIndex *idx,
+	void		(*delete_name)		(CamelIndex *index,
 						 const gchar *name);
 	CamelIndexCursor *
-			(*find)			(CamelIndex *idx,
+			(*find)			(CamelIndex *index,
 						 const gchar *word);
 	CamelIndexCursor *
-			(*words)		(CamelIndex *idx);
+			(*words)		(CamelIndex *index);
 	CamelIndexCursor *
-			(*names)		(CamelIndex *idx);
+			(*names)		(CamelIndex *index);
 };
 
 /* flags, stored in 'state', set with set_state */
 #define CAMEL_INDEX_DELETED (1<<0)
 
-GType		camel_index_get_type	(void);
-CamelIndex *	camel_index_new		(const gchar *path,
-					 gint flags);
-void		camel_index_construct	(CamelIndex *index,
-					 const gchar *path,
-					 gint flags);
-gint		camel_index_rename	(CamelIndex *index,
-					 const gchar *path);
-void		camel_index_set_normalise
-					(CamelIndex *idx,
-					 CamelIndexNorm func,
-					 gpointer data);
-gint		camel_index_sync	(CamelIndex *idx,
-					 GError **error);
-gint		camel_index_compress	(CamelIndex *idx,
-					 GError **error);
-gint		camel_index_delete	(CamelIndex *idx);
-gint		camel_index_has_name	(CamelIndex *idx,
-					 const gchar *name);
-CamelIndexName *camel_index_add_name	(CamelIndex *idx,
-					 const gchar *name);
-gint		camel_index_write_name	(CamelIndex *idx,
-					 CamelIndexName *idn);
+GType		camel_index_get_type		(void);
+CamelIndex *	camel_index_new			(const gchar *path,
+						 gint flags);
+void		camel_index_construct		(CamelIndex *index,
+						 const gchar *path,
+						 gint flags);
+gint		camel_index_rename		(CamelIndex *index,
+						 const gchar *path);
+void		camel_index_set_normalize	(CamelIndex *index,
+						 CamelIndexNorm func,
+						 gpointer data);
+gint		camel_index_sync		(CamelIndex *index,
+						 GError **error);
+gint		camel_index_compress		(CamelIndex *index,
+						 GError **error);
+gint		camel_index_delete		(CamelIndex *index);
+gint		camel_index_has_name		(CamelIndex *index,
+						 const gchar *name);
+CamelIndexName *camel_index_add_name		(CamelIndex *index,
+						 const gchar *name);
+gint		camel_index_write_name		(CamelIndex *index,
+						 CamelIndexName *idn);
 CamelIndexCursor *
-		camel_index_find_name	(CamelIndex *idx,
-					 const gchar *name);
-void		camel_index_delete_name	(CamelIndex *idx,
-					 const gchar *name);
+		camel_index_find_name		(CamelIndex *index,
+						 const gchar *name);
+void		camel_index_delete_name		(CamelIndex *index,
+						 const gchar *name);
 CamelIndexCursor *
-		camel_index_find	(CamelIndex *idx,
-					 const gchar *word);
+		camel_index_find		(CamelIndex *index,
+						 const gchar *word);
 CamelIndexCursor *
-		camel_index_words	(CamelIndex *idx);
+		camel_index_words		(CamelIndex *index);
 CamelIndexCursor *
-		camel_index_names	(CamelIndex *idx);
+		camel_index_names		(CamelIndex *index);
 
 G_END_DECLS
 
diff --git a/camel/camel-internet-address.c b/camel/camel-internet-address.c
index 001cf04..5518231 100644
--- a/camel/camel-internet-address.c
+++ b/camel/camel-internet-address.c
@@ -291,7 +291,7 @@ camel_internet_address_add (CamelInternetAddress *addr, const gchar *name, const
  * Returns: %TRUE if such an address exists, or %FALSE otherwise
  **/
 gboolean
-camel_internet_address_get (const CamelInternetAddress *addr, gint index, const gchar **namep, const gchar **addressp)
+camel_internet_address_get (CamelInternetAddress *addr, gint index, const gchar **namep, const gchar **addressp)
 {
 	struct _address *a;
 
diff --git a/camel/camel-internet-address.h b/camel/camel-internet-address.h
index 6ea1ce6..60d3e2c 100644
--- a/camel/camel-internet-address.h
+++ b/camel/camel-internet-address.h
@@ -63,17 +63,31 @@ struct _CamelInternetAddressClass {
 };
 
 GType		camel_internet_address_get_type	(void);
-CamelInternetAddress   *camel_internet_address_new	(void);
-
-gint			camel_internet_address_add	(CamelInternetAddress *addr, const gchar *name, const gchar *address);
-gboolean		camel_internet_address_get	(const CamelInternetAddress *addr, gint index, const gchar **namep, const gchar **addressp);
-
-gint			camel_internet_address_find_name(CamelInternetAddress *addr, const gchar *name, const gchar **addressp);
-gint			camel_internet_address_find_address(CamelInternetAddress *addr, const gchar *address, const gchar **namep);
+CamelInternetAddress *
+		camel_internet_address_new	(void);
+gint		camel_internet_address_add	(CamelInternetAddress *addr,
+						 const gchar *name,
+						 const gchar *address);
+gboolean	camel_internet_address_get	(CamelInternetAddress *addr,
+						 gint index,
+						 const gchar **namep,
+						 const gchar **addressp);
+gint		camel_internet_address_find_name(CamelInternetAddress *addr,
+						 const gchar *name,
+						 const gchar **addressp);
+gint		camel_internet_address_find_address
+						(CamelInternetAddress *addr,
+						 const gchar *address,
+						 const gchar **namep);
 
 /* utility functions, for network/display formatting */
-gchar *			camel_internet_address_encode_address(gint *len, const gchar *name, const gchar *addr);
-gchar *			camel_internet_address_format_address(const gchar *name, const gchar *addr);
+gchar *		camel_internet_address_encode_address
+						(gint *len,
+						 const gchar *name,
+						 const gchar *addr);
+gchar *		camel_internet_address_format_address
+						(const gchar *name,
+						 const gchar *addr);
 
 G_END_DECLS
 
diff --git a/camel/camel-medium.h b/camel/camel-medium.h
index 6a04943..043da09 100644
--- a/camel/camel-medium.h
+++ b/camel/camel-medium.h
@@ -70,32 +70,41 @@ struct _CamelMedium {
 struct _CamelMediumClass {
 	CamelDataWrapperClass parent_class;
 
-	/* Virtual methods */
-	void  (*add_header) (CamelMedium *medium, const gchar *name, gconstpointer value);
-	void  (*set_header) (CamelMedium *medium, const gchar *name, gconstpointer value);
-	void  (*remove_header) (CamelMedium *medium, const gchar *name);
-	gconstpointer  (*get_header) (CamelMedium *medium,  const gchar *name);
-
+	void		(*add_header)		(CamelMedium *medium,
+						 const gchar *name,
+						 gconstpointer value);
+	void		(*set_header)		(CamelMedium *medium,
+						 const gchar *name,
+						 gconstpointer value);
+	void		(*remove_header)	(CamelMedium *medium,
+						 const gchar *name);
+	gconstpointer	(*get_header)		(CamelMedium *medium,
+						 const gchar *name);
 	GArray * (*get_headers) (CamelMedium *medium);
-	void (*free_headers) (CamelMedium *medium, GArray *headers);
-
-	CamelDataWrapper * (*get_content) (CamelMedium *medium);
-	void (*set_content) (CamelMedium *medium, CamelDataWrapper *content);
+	void		(*free_headers)		(CamelMedium *medium,
+						 GArray *headers);
+	CamelDataWrapper *
+			(*get_content)		(CamelMedium *medium);
+	void		(*set_content)		(CamelMedium *medium,
+						 CamelDataWrapper *content);
 };
 
-GType camel_medium_get_type (void);
-
-/* Header get/set interface */
-void camel_medium_add_header (CamelMedium *medium, const gchar *name, gconstpointer value);
-void camel_medium_set_header (CamelMedium *medium, const gchar *name, gconstpointer value);
-void camel_medium_remove_header (CamelMedium *medium, const gchar *name);
-gconstpointer camel_medium_get_header (CamelMedium *medium, const gchar *name);
-
+GType		camel_medium_get_type		(void);
+void		camel_medium_add_header		(CamelMedium *medium,
+						 const gchar *name,
+						 gconstpointer value);
+void		camel_medium_set_header		(CamelMedium *medium,
+						 const gchar *name,
+						 gconstpointer value);
+void		camel_medium_remove_header	(CamelMedium *medium,
+						 const gchar *name);
+gconstpointer	camel_medium_get_header		(CamelMedium *medium,
+						 const gchar *name);
 GArray *camel_medium_get_headers (CamelMedium *medium);
-void camel_medium_free_headers (CamelMedium *medium, GArray *headers);
-
-/* accessor methods */
-CamelDataWrapper *camel_medium_get_content (CamelMedium *medium);
+void		camel_medium_free_headers	(CamelMedium *medium,
+						 GArray *headers);
+CamelDataWrapper *
+		camel_medium_get_content	(CamelMedium *medium);
 void camel_medium_set_content (CamelMedium *medium,
 			       CamelDataWrapper *content);
 
diff --git a/camel/camel-mime-part-utils.h b/camel/camel-mime-part-utils.h
index 774822d..0bb95c3 100644
--- a/camel/camel-mime-part-utils.h
+++ b/camel/camel-mime-part-utils.h
@@ -39,7 +39,8 @@ gboolean	camel_mime_part_construct_content_from_parser
 						(CamelMimePart *mime_part,
 						 CamelMimeParser *mp,
 						 GError **error);
-gboolean camel_mime_message_build_preview (CamelMimePart *msg, CamelMessageInfo *info);
+gboolean	camel_mime_message_build_preview(CamelMimePart *mime_part,
+						 CamelMessageInfo *info);
 
 G_END_DECLS
 
diff --git a/camel/camel-nntp-address.c b/camel/camel-nntp-address.c
index ccf78c2..b7619f8 100644
--- a/camel/camel-nntp-address.c
+++ b/camel/camel-nntp-address.c
@@ -179,7 +179,7 @@ camel_nntp_address_add (CamelNNTPAddress *a, const gchar *name)
  * Returns: TRUE if such an address exists, or FALSE otherwise.
  **/
 gboolean
-camel_nntp_address_get (const CamelNNTPAddress *a, gint index, const gchar **namep)
+camel_nntp_address_get (CamelNNTPAddress *a, gint index, const gchar **namep)
 {
 	g_assert(CAMEL_IS_NNTP_ADDRESS(a));
 
diff --git a/camel/camel-nntp-address.h b/camel/camel-nntp-address.h
index 569e82b..20df318 100644
--- a/camel/camel-nntp-address.h
+++ b/camel/camel-nntp-address.h
@@ -63,10 +63,13 @@ struct _CamelNNTPAddressClass {
 };
 
 GType		camel_nntp_address_get_type	(void);
-CamelNNTPAddress   *camel_nntp_address_new	(void);
-
-gint			camel_nntp_address_add	(CamelNNTPAddress *a, const gchar *name);
-gboolean		camel_nntp_address_get	(const CamelNNTPAddress *a, gint index, const gchar **namep);
+CamelNNTPAddress *
+		camel_nntp_address_new		(void);
+gint		camel_nntp_address_add		(CamelNNTPAddress *a,
+						 const gchar *name);
+gboolean	camel_nntp_address_get		(CamelNNTPAddress *a,
+						 gint index,
+						 const gchar **namep);
 
 G_END_DECLS
 
diff --git a/camel/camel-operation.c b/camel/camel-operation.c
index 5ff6bfc..e185ccb 100644
--- a/camel/camel-operation.c
+++ b/camel/camel-operation.c
@@ -229,47 +229,6 @@ camel_operation_unref (CamelOperation *cc)
 }
 
 /**
- * camel_operation_cancel_block:
- * @cc: operation context
- *
- * Block cancellation for this operation.  If @cc is NULL, then the
- * current thread is blocked.
- **/
-void
-camel_operation_cancel_block (CamelOperation *cc)
-{
-	if (cc == NULL)
-		cc = co_getcc();
-
-	if (cc) {
-		LOCK();
-		cc->blocked++;
-		UNLOCK();
-	}
-}
-
-/**
- * camel_operation_cancel_unblock:
- * @cc: operation context
- *
- * Unblock cancellation, when the unblock count reaches the block
- * count, then this operation can be cancelled.  If @cc is NULL, then
- * the current thread is unblocked.
- **/
-void
-camel_operation_cancel_unblock (CamelOperation *cc)
-{
-	if (cc == NULL)
-		cc = co_getcc();
-
-	if (cc) {
-		LOCK();
-		cc->blocked--;
-		UNLOCK();
-	}
-}
-
-/**
  * camel_operation_cancel:
  * @cc: operation context
  *
@@ -635,18 +594,6 @@ camel_operation_progress (CamelOperation *cc, gint pc)
 }
 
 /**
- * camel_operation_progress_count:
- * @cc: operation context
- * @sofar:
- *
- **/
-void
-camel_operation_progress_count (CamelOperation *cc, gint sofar)
-{
-	camel_operation_progress(cc, sofar);
-}
-
-/**
  * camel_operation_end:
  * @cc: operation context
  *
diff --git a/camel/camel-operation.h b/camel/camel-operation.h
index dc54647..1a5ca83 100644
--- a/camel/camel-operation.h
+++ b/camel/camel-operation.h
@@ -66,12 +66,6 @@ void camel_operation_start_transient(CamelOperation *cc, const gchar *what, ...)
 void camel_operation_progress(CamelOperation *cc, gint pc);
 void camel_operation_end(CamelOperation *cc);
 
-#ifndef CAMEL_DISABLE_DEPRECATED
-void camel_operation_cancel_block(CamelOperation *cc);
-void camel_operation_cancel_unblock(CamelOperation *cc);
-void camel_operation_progress_count(CamelOperation *cc, gint sofar);
-#endif /* CAMEL_DISABLE_DEPRECATED */
-
 G_END_DECLS
 
 #endif /* CAMEL_OPERATION_H */
diff --git a/camel/camel-sasl.h b/camel/camel-sasl.h
index 3d47b51..daace35 100644
--- a/camel/camel-sasl.h
+++ b/camel/camel-sasl.h
@@ -68,13 +68,14 @@ struct _CamelSaslClass {
 						 GError **error);
 };
 
-GType  camel_sasl_get_type (void);
+GType		camel_sasl_get_type		(void);
 
-/* public methods */
-GByteArray *camel_sasl_challenge        (CamelSasl *sasl, GByteArray *token, GError **error);
-gchar       *camel_sasl_challenge_base64 (CamelSasl *sasl, const gchar *token, GError **error);
-
-/* utility functions */
+GByteArray *	camel_sasl_challenge		(CamelSasl *sasl,
+						 GByteArray *token,
+						 GError **error);
+gchar *		camel_sasl_challenge_base64	(CamelSasl *sasl,
+						 const gchar *token,
+						 GError **error);
 CamelSasl *	camel_sasl_new			(const gchar *service_name,
 						 const gchar *mechanism,
 						 CamelService *service);
@@ -85,8 +86,9 @@ const gchar *	camel_sasl_get_mechanism	(CamelSasl *sasl);
 CamelService *	camel_sasl_get_service		(CamelSasl *sasl);
 const gchar *	camel_sasl_get_service_name	(CamelSasl *sasl);
 
-GList                *camel_sasl_authtype_list (gboolean include_plain);
-CamelServiceAuthType *camel_sasl_authtype      (const gchar *mechanism);
+GList *		camel_sasl_authtype_list	(gboolean include_plain);
+CamelServiceAuthType *
+		camel_sasl_authtype		(const gchar *mechanism);
 
 G_END_DECLS
 
diff --git a/camel/camel-service.h b/camel/camel-service.h
index 60eaf07..bc3055e 100644
--- a/camel/camel-service.h
+++ b/camel/camel-service.h
@@ -113,17 +113,14 @@ struct _CamelServiceClass {
 						 CamelProvider *provider,
 						 CamelURL *url,
 						 GError **error);
-
 	gboolean	(*connect)		(CamelService *service,
 						 GError **error);
 	gboolean	(*disconnect)		(CamelService *service,
 						 gboolean clean,
 						 GError **error);
 	void		(*cancel_connect)	(CamelService *service);
-
 	GList *		(*query_auth_types)	(CamelService *service,
 						 GError **error);
-
 	gchar *		(*get_name)		(CamelService *service,
 						 gboolean brief);
 	gchar *		(*get_path)		(CamelService *service);
diff --git a/camel/camel-session.h b/camel/camel-session.h
index df9d15a..86f7411 100644
--- a/camel/camel-session.h
+++ b/camel/camel-session.h
@@ -33,7 +33,6 @@
 #include <camel/camel-filter-driver.h>
 #include <camel/camel-junk-plugin.h>
 #include <camel/camel-msgport.h>
-#include <camel/camel-object.h>
 #include <camel/camel-provider.h>
 #include <camel/camel-service.h>
 
@@ -141,8 +140,8 @@ struct _CamelSessionClass {
 	gboolean        (*lookup_addressbook)(CamelSession *session,
 					      const gchar *name);
 	void		(*forward_to)        (CamelSession *session,
-					      struct _CamelFolder *folder,
-					      struct _CamelMimeMessage *message,
+					      CamelFolder *folder,
+					      CamelMimeMessage *message,
 					      const gchar *address,
 					      GError **error);
 };
@@ -207,8 +206,8 @@ void               camel_session_set_check_junk     (CamelSession *session,
 						     gboolean check_junk);
 
 struct _CamelSessionThreadOps {
-	void (*receive)(CamelSession *session, struct _CamelSessionThreadMsg *m);
-	void (*free)(CamelSession *session, struct _CamelSessionThreadMsg *m);
+	void (*receive)(CamelSession *session, CamelSessionThreadMsg *m);
+	void (*free)(CamelSession *session, CamelSessionThreadMsg *m);
 };
 
 struct _CamelSessionThreadMsg {
@@ -218,7 +217,7 @@ struct _CamelSessionThreadMsg {
 
 	GError *error;
 	CamelSessionThreadOps *ops;
-	struct _CamelOperation *op;
+	CamelOperation *op;
 	CamelSession *session;
 
 	gpointer data; /* free for implementation to define, not used by camel, do not use in client code */
@@ -247,8 +246,8 @@ gboolean           camel_session_lookup_addressbook (CamelSession *session,
 						     const gchar *name);
 
 void		   camel_session_forward_to         (CamelSession *session,
-						     struct _CamelFolder *folder,
-						     struct _CamelMimeMessage *message,
+						     CamelFolder *folder,
+						     CamelMimeMessage *message,
 						     const gchar *address,
 						     GError **error);
 
diff --git a/camel/camel-smime-context.h b/camel/camel-smime-context.h
index 35cf2b8..4aed11b 100644
--- a/camel/camel-smime-context.h
+++ b/camel/camel-smime-context.h
@@ -63,8 +63,6 @@ typedef enum _camel_smime_describe_t {
 	CAMEL_SMIME_CRLS = 1<<3
 } camel_smime_describe_t;
 
-struct _CamelSession;
-
 typedef struct _CamelSMIMEContext CamelSMIMEContext;
 typedef struct _CamelSMIMEContextClass CamelSMIMEContextClass;
 typedef struct _CamelSMIMEContextPrivate CamelSMIMEContextPrivate;
@@ -80,7 +78,7 @@ struct _CamelSMIMEContextClass {
 
 GType camel_smime_context_get_type(void);
 
-CamelCipherContext *camel_smime_context_new(struct _CamelSession *session);
+CamelCipherContext *camel_smime_context_new(CamelSession *session);
 
 /* nick to use for SMIMEEncKeyPrefs attribute for signed data */
 void camel_smime_context_set_encrypt_key(CamelSMIMEContext *context, gboolean use, const gchar *key);
diff --git a/camel/camel-store-summary.h b/camel/camel-store-summary.h
index 58105e1..4780cf1 100644
--- a/camel/camel-store-summary.h
+++ b/camel/camel-store-summary.h
@@ -104,7 +104,6 @@ typedef enum _CamelStoreSummaryFlags {
 
 struct _CamelStoreSummary {
 	CamelObject parent;
-
 	CamelStoreSummaryPrivate *priv;
 
 	/* header info */
diff --git a/camel/camel-store.h b/camel/camel-store.h
index 028db84..bde269e 100644
--- a/camel/camel-store.h
+++ b/camel/camel-store.h
@@ -35,7 +35,6 @@
 #include <sys/types.h>
 
 #include <camel/camel-folder.h>
-#include <camel/camel-object.h>
 #include <camel/camel-service.h>
 
 /* Standard GObject macros */
diff --git a/camel/camel-stream-buffer.h b/camel/camel-stream-buffer.h
index ee15f6e..c1d82d6 100644
--- a/camel/camel-stream-buffer.h
+++ b/camel/camel-stream-buffer.h
@@ -92,8 +92,6 @@ CamelStream *	camel_stream_buffer_new_with_vbuf
 						 CamelStreamBufferMode mode,
 						 gchar *buf,
 						 guint32 size);
-
-/* read a line of characters */
 gint		camel_stream_buffer_gets	(CamelStreamBuffer *sbf,
 						 gchar *buf,
 						 guint max,
diff --git a/camel/camel-stream-process.h b/camel/camel-stream-process.h
index 84496d6..047b112 100644
--- a/camel/camel-stream-process.h
+++ b/camel/camel-stream-process.h
@@ -64,8 +64,10 @@ struct _CamelStreamProcessClass {
 };
 
 GType		camel_stream_process_get_type	(void);
-CamelStream            *camel_stream_process_new		(void);
-gint camel_stream_process_connect(CamelStreamProcess *, const gchar *, const gchar **);
+CamelStream *	camel_stream_process_new	(void);
+gint		camel_stream_process_connect	(CamelStreamProcess *stream,
+						 const gchar *command,
+						 const gchar **env);
 
 G_END_DECLS
 
diff --git a/camel/camel-stream-vfs.h b/camel/camel-stream-vfs.h
index ed98918..8231725 100644
--- a/camel/camel-stream-vfs.h
+++ b/camel/camel-stream-vfs.h
@@ -53,6 +53,7 @@
 G_BEGIN_DECLS
 
 typedef struct _CamelStreamVFS CamelStreamVFS;
+typedef struct _CamelStreamVFSClass CamelStreamVFSClass;
 
 struct _CamelStreamVFS {
 	CamelStream parent;
@@ -60,10 +61,9 @@ struct _CamelStreamVFS {
 	GObject *stream;
 };
 
-typedef struct {
+struct _CamelStreamVFSClass {
 	CamelStreamClass parent_class;
-
-} CamelStreamVFSClass;
+};
 
 GType camel_stream_vfs_get_type (void);
 
diff --git a/camel/camel-stream.h b/camel/camel-stream.h
index 03ddf0f..e5fd686 100644
--- a/camel/camel-stream.h
+++ b/camel/camel-stream.h
@@ -67,7 +67,7 @@ struct _CamelStreamClass {
 	CamelObjectClass parent_class;
 
 	gssize		(*read)			(CamelStream *stream,
-					 	 gchar *buffer,
+						 gchar *buffer,
 						 gsize n,
 						 GError **error);
 	gssize		(*write)		(CamelStream *stream,
diff --git a/camel/camel-tcp-stream.h b/camel/camel-tcp-stream.h
index f4ffddc..7eec5bb 100644
--- a/camel/camel-tcp-stream.h
+++ b/camel/camel-tcp-stream.h
@@ -123,7 +123,6 @@ struct _CamelTcpStreamClass {
 						 CamelSockOptData *data);
 	gint		(*setsockopt)		(CamelTcpStream *stream,
 						 const CamelSockOptData *data);
-
 	struct sockaddr *
 			(*get_local_address)	(CamelTcpStream *stream,
 						 socklen_t *len);
diff --git a/camel/camel-text-index.c b/camel/camel-text-index.c
index 5b52898..129e063 100644
--- a/camel/camel-text-index.c
+++ b/camel/camel-text-index.c
@@ -865,7 +865,7 @@ camel_text_index_init (CamelTextIndex *text_index)
 }
 
 static gchar *
-text_index_normalise (CamelIndex *idx, const gchar *in, gpointer data)
+text_index_normalize (CamelIndex *idx, const gchar *in, gpointer data)
 {
 	gchar *word;
 
@@ -888,7 +888,7 @@ camel_text_index_new (const gchar *path,
 	CamelBlock *bl;
 
 	camel_index_construct ((CamelIndex *)idx, path, flags);
-	camel_index_set_normalise ((CamelIndex *)idx, text_index_normalise, NULL);
+	camel_index_set_normalize ((CamelIndex *)idx, text_index_normalize, NULL);
 
 	p->blocks = camel_block_file_new (
 		idx->parent.path, flags, CAMEL_TEXT_INDEX_VERSION,
diff --git a/camel/camel-vee-folder.h b/camel/camel-vee-folder.h
index e325f40..f548b5d 100644
--- a/camel/camel-vee-folder.h
+++ b/camel/camel-vee-folder.h
@@ -58,7 +58,6 @@ typedef struct _CamelVeeFolderPrivate CamelVeeFolderPrivate;
 
 struct _CamelVeeFolder {
 	CamelFolder parent;
-
 	CamelVeeFolderPrivate *priv;
 
 	gchar *expression;	/* query expression */
diff --git a/camel/camel-vee-store.h b/camel/camel-vee-store.h
index 73241ea..ae16975 100644
--- a/camel/camel-vee-store.h
+++ b/camel/camel-vee-store.h
@@ -75,7 +75,7 @@ struct _CamelVeeStoreClass {
 };
 
 GType		camel_vee_store_get_type	(void);
-CamelVeeStore      *camel_vee_store_new	(void);
+CamelVeeStore *	camel_vee_store_new		(void);
 
 G_END_DECLS
 
diff --git a/camel/camel-vee-summary.h b/camel/camel-vee-summary.h
index 1bbd7a0..28ac2d3 100644
--- a/camel/camel-vee-summary.h
+++ b/camel/camel-vee-summary.h
@@ -72,15 +72,20 @@ struct _CamelVeeSummary {
 
 struct _CamelVeeSummaryClass {
 	CamelFolderSummaryClass parent_class;
-
 };
 
-GType               camel_vee_summary_get_type     (void);
-CamelFolderSummary *camel_vee_summary_new(struct _CamelFolder *parent);
-
-CamelVeeMessageInfo * camel_vee_summary_add(CamelVeeSummary *s, CamelFolderSummary *summary, const gchar *uid, const gchar hash[8]);
-GPtrArray * camel_vee_summary_get_ids (CamelVeeSummary *summary, gchar hash[8]);
-void camel_vee_summary_load_check_unread_vfolder  (CamelVeeSummary *vs);
+GType		camel_vee_summary_get_type	(void);
+CamelFolderSummary *
+		camel_vee_summary_new		(struct _CamelFolder *parent);
+CamelVeeMessageInfo *
+		camel_vee_summary_add		(CamelVeeSummary *s,
+						 CamelFolderSummary *summary,
+						 const gchar *uid,
+						 const gchar hash[8]);
+GPtrArray *	camel_vee_summary_get_ids	(CamelVeeSummary *summary,
+						 gchar hash[8]);
+void		camel_vee_summary_load_check_unread_vfolder
+						(CamelVeeSummary *vs);
 
 G_END_DECLS
 
diff --git a/camel/camel-vtrash-folder.h b/camel/camel-vtrash-folder.h
index dcaef62..d9ee180 100644
--- a/camel/camel-vtrash-folder.h
+++ b/camel/camel-vtrash-folder.h
@@ -72,12 +72,11 @@ struct _CamelVTrashFolder {
 
 struct _CamelVTrashFolderClass {
 	CamelVeeFolderClass parent_class;
-
 };
 
-GType       camel_vtrash_folder_get_type    (void);
-
-CamelFolder    *camel_vtrash_folder_new		(CamelStore *parent_store, camel_vtrash_folder_t type);
+GType		camel_vtrash_folder_get_type	(void);
+CamelFolder *	camel_vtrash_folder_new		(CamelStore *parent_store,
+						 camel_vtrash_folder_t type);
 
 G_END_DECLS
 
diff --git a/camel/providers/groupwise/camel-groupwise-summary.c b/camel/providers/groupwise/camel-groupwise-summary.c
index d7dea36..ee11e8a 100644
--- a/camel/providers/groupwise/camel-groupwise-summary.c
+++ b/camel/providers/groupwise/camel-groupwise-summary.c
@@ -448,9 +448,6 @@ groupwise_summary_clear (CamelFolderSummary *summary, gboolean uncache)
 	camel_folder_summary_clear_db (summary);
 	/*camel_folder_summary_save (summary);*/
 
-	if (uncache)
-		camel_data_cache_clear (((CamelGroupwiseFolder *) summary->folder)->cache, "cache", NULL);
-
 	if (camel_folder_change_info_changed (changes))
 		camel_object_trigger_event (summary->folder, "folder_changed", changes);
 	camel_folder_change_info_free (changes);
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index b0545ab..d7835c5 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -2533,7 +2533,7 @@ static gint imap_match_pattern (CamelImapStoreNamespace *ns, const gchar *patter
 }
 
 /* imap needs to treat inbox case insensitive */
-/* we'll assume the names are normalised already */
+/* we'll assume the names are normalized already */
 static guint folder_hash(gconstpointer ap)
 {
 	const gchar *a = ap;
diff --git a/camel/providers/imapx/camel-imapx-store.c b/camel/providers/imapx/camel-imapx-store.c
index 9d86cd5..2cc7160 100644
--- a/camel/providers/imapx/camel-imapx-store.c
+++ b/camel/providers/imapx/camel-imapx-store.c
@@ -405,7 +405,7 @@ fill_fi(CamelStore *store, CamelFolderInfo *fi, guint32 flags)
 }
 
 /* imap needs to treat inbox case insensitive */
-/* we'll assume the names are normalised already */
+/* we'll assume the names are normalized already */
 static guint
 folder_hash(gconstpointer ap)
 {
diff --git a/docs/reference/camel/tmpl/camel-data-cache.sgml b/docs/reference/camel/tmpl/camel-data-cache.sgml
index 9f6251f..d846bda 100644
--- a/docs/reference/camel/tmpl/camel-data-cache.sgml
+++ b/docs/reference/camel/tmpl/camel-data-cache.sgml
@@ -74,18 +74,6 @@ CamelDataCache
 @when: 
 
 
-<!-- ##### FUNCTION camel_data_cache_rename ##### -->
-<para>
-
-</para>
-
- cache: 
- old: 
- new: 
- error: 
- Returns: 
-
-
 <!-- ##### FUNCTION camel_data_cache_add ##### -->
 <para>
 
@@ -122,17 +110,6 @@ CamelDataCache
 @Returns: 
 
 
-<!-- ##### FUNCTION camel_data_cache_clear ##### -->
-<para>
-
-</para>
-
- cache: 
- path: 
- error: 
- Returns: 
-
-
 <!-- ##### FUNCTION camel_data_cache_get_filename ##### -->
 <para>
 
diff --git a/docs/reference/camel/tmpl/camel-index.sgml b/docs/reference/camel/tmpl/camel-index.sgml
index dd9b519..eff126f 100644
--- a/docs/reference/camel/tmpl/camel-index.sgml
+++ b/docs/reference/camel/tmpl/camel-index.sgml
@@ -28,7 +28,7 @@ CamelIndex
 
 </para>
 
- idx: 
+ index: 
 @word: 
 @data: 
 @Returns: 
@@ -45,7 +45,7 @@ CamelIndex
 
 </para>
 
- idx: 
+ index: 
 @name: 
 @Returns: 
 
@@ -78,7 +78,7 @@ CamelIndex
 
 </para>
 
- idx: 
+ index: 
 @name: 
 @Returns: 
 
@@ -140,22 +140,12 @@ CamelIndex
 @Returns: 
 
 
-<!-- ##### FUNCTION camel_index_set_normalise ##### -->
-<para>
-
-</para>
-
- idx: 
- func: 
- data: 
-
-
 <!-- ##### FUNCTION camel_index_sync ##### -->
 <para>
 
 </para>
 
- idx: 
+ index: 
 @error: 
 @Returns: 
 
@@ -165,7 +155,7 @@ CamelIndex
 
 </para>
 
- idx: 
+ index: 
 @error: 
 @Returns: 
 
@@ -175,7 +165,7 @@ CamelIndex
 
 </para>
 
- idx: 
+ index: 
 @Returns: 
 
 
@@ -184,7 +174,7 @@ CamelIndex
 
 </para>
 
- idx: 
+ index: 
 @name: 
 @Returns: 
 
@@ -194,7 +184,7 @@ CamelIndex
 
 </para>
 
- idx: 
+ index: 
 @name: 
 @Returns: 
 
@@ -204,7 +194,7 @@ CamelIndex
 
 </para>
 
- idx: 
+ index: 
 @idn: 
 @Returns: 
 
@@ -214,7 +204,7 @@ CamelIndex
 
 </para>
 
- idx: 
+ index: 
 @name: 
 @Returns: 
 
@@ -224,7 +214,7 @@ CamelIndex
 
 </para>
 
- idx: 
+ index: 
 @name: 
 
 
@@ -233,7 +223,7 @@ CamelIndex
 
 </para>
 
- idx: 
+ index: 
 @word: 
 @Returns: 
 
@@ -243,7 +233,7 @@ CamelIndex
 
 </para>
 
- idx: 
+ index: 
 @Returns: 
 
 
@@ -252,7 +242,7 @@ CamelIndex
 
 </para>
 
- idx: 
+ index: 
 @Returns: 
 
 
diff --git a/docs/reference/camel/tmpl/camel-mime-part.sgml b/docs/reference/camel/tmpl/camel-mime-part.sgml
index da7f9e5..d9e6cbb 100644
--- a/docs/reference/camel/tmpl/camel-mime-part.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-part.sgml
@@ -278,7 +278,7 @@ CamelMimePart
 
 </para>
 
- msg: 
+ mime_part: 
 @info: 
 @Returns: 
 
diff --git a/docs/reference/camel/tmpl/camel-operation.sgml b/docs/reference/camel/tmpl/camel-operation.sgml
index fb33327..748243c 100644
--- a/docs/reference/camel/tmpl/camel-operation.sgml
+++ b/docs/reference/camel/tmpl/camel-operation.sgml
@@ -109,22 +109,6 @@ camel-operation
 @cc: 
 
 
-<!-- ##### FUNCTION camel_operation_cancel_block ##### -->
-<para>
-
-</para>
-
- cc: 
-
-
-<!-- ##### FUNCTION camel_operation_cancel_unblock ##### -->
-<para>
-
-</para>
-
- cc: 
-
-
 <!-- ##### FUNCTION camel_operation_cancel_check ##### -->
 <para>
 
@@ -189,15 +173,6 @@ camel-operation
 @pc: 
 
 
-<!-- ##### FUNCTION camel_operation_progress_count ##### -->
-<para>
-
-</para>
-
- cc: 
- sofar: 
-
-
 <!-- ##### FUNCTION camel_operation_end ##### -->
 <para>
 
diff --git a/docs/reference/camel/tmpl/camel-stream-process.sgml b/docs/reference/camel/tmpl/camel-stream-process.sgml
index b5c6d1d..a1e349e 100644
--- a/docs/reference/camel/tmpl/camel-stream-process.sgml
+++ b/docs/reference/camel/tmpl/camel-stream-process.sgml
@@ -36,9 +36,9 @@ CamelStreamProcess
 
 </para>
 
- Param1: 
- Param2: 
- Param3: 
+ stream: 
+ command: 
+ env: 
 @Returns: 
 
 
diff --git a/docs/reference/camel/tmpl/camel-unused.sgml b/docs/reference/camel/tmpl/camel-unused.sgml
index 497bcce..9d3f1fd 100644
--- a/docs/reference/camel/tmpl/camel-unused.sgml
+++ b/docs/reference/camel/tmpl/camel-unused.sgml
@@ -584,6 +584,36 @@ camel-types
 </para>
 
 
+<!-- ##### FUNCTION camel_data_cache_clear ##### -->
+<para>
+
+</para>
+
+ cache: 
+ path: 
+ error: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_data_cache_rename ##### -->
+<para>
+
+</para>
+
+ cache: 
+ old: 
+ new: 
+ error: 
+ Returns: 
+
+<!-- ##### FUNCTION camel_index_set_normalise ##### -->
+<para>
+
+</para>
+
+ idx: 
+ func: 
+ data: 
+
 <!-- ##### FUNCTION camel_name_to_type ##### -->
 <para>
 
@@ -722,6 +752,28 @@ camel-types
 
 @Param1: 
 
+<!-- ##### FUNCTION camel_operation_cancel_block ##### -->
+<para>
+
+</para>
+
+ cc: 
+
+<!-- ##### FUNCTION camel_operation_cancel_unblock ##### -->
+<para>
+
+</para>
+
+ cc: 
+
+<!-- ##### FUNCTION camel_operation_progress_count ##### -->
+<para>
+
+</para>
+
+ cc: 
+ sofar: 
+
 <!-- ##### FUNCTION camel_search_build_match_regex ##### -->
 <para>
 



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