Collect Camel flags into enum types.

Camel has many struct members and function parameters named 'flags'.
Using a plain integer type for these can lead to confusion about which
flag definitions are expected.

This collects flag values into enumeration types, and changes the
struct member or function parameter type from a plain integer type
to the proper enumeration type.

TODO: Collect enum types into a camel-enums.h file and let GObject
      generate GTypes for each of them so they can be used properly
      in GObject properties, GtkTreeModel columns, etc.

9 files changed, 630 insertions, 618 deletions

diff --git a/docs/reference/camel/camel-sections.txt b/docs/reference/camel/camel-sections.txt
index 1652a1b23..c80f93644 100644
--- a/docs/reference/camel/camel-sections.txt
+++ b/docs/reference/camel/camel-sections.txt
@@ -31,14 +31,13 @@ camel_address_get_type
 <TITLE>CamelKeyFile</TITLE>
 camel_block_t
 camel_key_t
+CamelBlockFileFlags
+CamelBlockFlags
 CamelBlockRoot
 CamelBlock
 CamelBlockFile
-CAMEL_BLOCK_FILE_SYNC
 CAMEL_BLOCK_SIZE
 CAMEL_BLOCK_SIZE_BITS
-CAMEL_BLOCK_DIRTY
-CAMEL_BLOCK_DETACHED
 camel_block_file_new
 camel_block_file_rename
 camel_block_file_delete
@@ -82,6 +81,7 @@ camel_key_file_get_type
 <SECTION>
 <FILE>camel-certdb</FILE>
 <TITLE>CamelCertDB</TITLE>
+CamelCertDBFlags
 CamelCertDB
 CamelCertTrust
 CamelCert
@@ -422,18 +422,12 @@ camel_filter_driver_get_type
 <SECTION>
 <FILE>camel-folder</FILE>
 <TITLE>CamelFolder</TITLE>
+CamelFolderFlags
 CamelFolder
 CAMEL_FOLDER_ERROR
 CamelFolderError
 CamelFolderChangeInfo
 CamelFolderQuotaInfo
-CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY
-CAMEL_FOLDER_HAS_SEARCH_CAPABILITY
-CAMEL_FOLDER_FILTER_RECENT
-CAMEL_FOLDER_HAS_BEEN_DELETED
-CAMEL_FOLDER_IS_TRASH
-CAMEL_FOLDER_IS_JUNK
-CAMEL_FOLDER_FILTER_JUNK
 camel_folder_set_lock_async
 camel_folder_get_parent_store
 camel_folder_get_name
@@ -1654,15 +1648,7 @@ CamelOperationPrivate
 <FILE>camel-provider</FILE>
 CamelProvider
 CamelProviderType
-CAMEL_PROVIDER_IS_LOCAL
-CAMEL_PROVIDER_IS_EXTERNAL
-CAMEL_PROVIDER_IS_SOURCE
-CAMEL_PROVIDER_IS_STORAGE
-CAMEL_PROVIDER_SUPPORTS_SSL
-CAMEL_PROVIDER_HAS_LICENSE
-CAMEL_PROVIDER_DISABLE_SENT_FOLDER
-CAMEL_PROVIDER_ALLOW_REAL_TRASH_FOLDER
-CAMEL_PROVIDER_ALLOW_REAL_JUNK_FOLDER
+CamelProviderFlags
 CAMEL_URL_PART_USER
 CAMEL_URL_PART_AUTH
 CAMEL_URL_PART_PASSWORD
@@ -1675,27 +1661,7 @@ CAMEL_URL_PART_HIDDEN
 CAMEL_PROVIDER_ALLOWS
 CAMEL_PROVIDER_NEEDS
 CAMEL_PROVIDER_HIDDEN
-CAMEL_URL_ALLOW_USER
-CAMEL_URL_ALLOW_AUTH
-CAMEL_URL_ALLOW_PASSWORD
-CAMEL_URL_ALLOW_HOST
-CAMEL_URL_ALLOW_PORT
-CAMEL_URL_ALLOW_PATH
-CAMEL_URL_NEED_USER
-CAMEL_URL_NEED_AUTH
-CAMEL_URL_NEED_PASSWORD
-CAMEL_URL_NEED_HOST
-CAMEL_URL_NEED_PORT
-CAMEL_URL_NEED_PATH
-CAMEL_URL_NEED_PATH_DIR
-CAMEL_URL_HIDDEN_USER
-CAMEL_URL_HIDDEN_AUTH
-CAMEL_URL_HIDDEN_PASSWORD
-CAMEL_URL_HIDDEN_HOST
-CAMEL_URL_HIDDEN_PORT
-CAMEL_URL_HIDDEN_PATH
-CAMEL_URL_FRAGMENT_IS_PATH
-CAMEL_URL_PATH_IS_ABSOLUTE
+CamelProviderURLFlags
 CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT
 CamelProviderConfType
 CamelProviderConfEntry
@@ -2107,45 +2073,15 @@ camel_store_summary_get_type
 CamelStore
 CAMEL_STORE_ERROR
 CamelStoreError
-CamelFolderInfo
-CAMEL_FOLDER_NOSELECT
-CAMEL_FOLDER_NOINFERIORS
-CAMEL_FOLDER_CHILDREN
-CAMEL_FOLDER_NOCHILDREN
-CAMEL_FOLDER_SUBSCRIBED
-CAMEL_FOLDER_VIRTUAL
-CAMEL_FOLDER_SYSTEM
-CAMEL_FOLDER_VTRASH
-CAMEL_FOLDER_SHARED_TO_ME
-CAMEL_FOLDER_SHARED_BY_ME
 CAMEL_FOLDER_TYPE_MASK
 CAMEL_FOLDER_TYPE_BIT
-CAMEL_FOLDER_TYPE_NORMAL
-CAMEL_FOLDER_TYPE_INBOX
-CAMEL_FOLDER_TYPE_OUTBOX
-CAMEL_FOLDER_TYPE_TRASH
-CAMEL_FOLDER_TYPE_JUNK
-CAMEL_FOLDER_TYPE_SENT
-CAMEL_STORE_READ
-CAMEL_STORE_WRITE
-CAMEL_STORE_SUBSCRIPTIONS
-CAMEL_STORE_VTRASH
-CAMEL_STORE_FILTER_INBOX
-CAMEL_STORE_VJUNK
-CAMEL_STORE_PROXY
-CAMEL_STORE_IS_MIGRATING
-CAMEL_STORE_ASYNC
-CAMEL_STORE_REAL_JUNK_FOLDER
-CAMEL_STORE_FOLDER_CREATE
-CAMEL_STORE_FOLDER_EXCL
-CAMEL_STORE_FOLDER_BODY_INDEX
-CAMEL_STORE_FOLDER_PRIVATE
+CamelFolderInfoFlags
+CamelFolderInfo
+CamelStoreFlags
+CamelStorePermissionFlags
+CamelStoreGetFolderFlags
 CAMEL_STORE_FOLDER_CREATE_EXCL
-CAMEL_STORE_FOLDER_INFO_FAST
-CAMEL_STORE_FOLDER_INFO_RECURSIVE
-CAMEL_STORE_FOLDER_INFO_SUBSCRIBED
-CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL
-CAMEL_STORE_FOLDER_INFO_SUBSCRIPTION_LIST
+CamelStoreGetFolderInfoFlags
 camel_store_folder_created
 camel_store_folder_deleted
 camel_store_folder_opened
@@ -2413,9 +2349,7 @@ camel_proxy_error_quark
 <FILE>camel-tcp-stream-ssl</FILE>
 <TITLE>CamelTcpStreamSSL</TITLE>
 CamelTcpStreamSSL
-CAMEL_TCP_STREAM_SSL_ENABLE_SSL2
-CAMEL_TCP_STREAM_SSL_ENABLE_SSL3
-CAMEL_TCP_STREAM_SSL_ENABLE_TLS
+CamelTcpStreamSSLFlags
 camel_tcp_stream_ssl_new
 camel_tcp_stream_ssl_new_raw
 camel_tcp_stream_ssl_enable_ssl
@@ -2962,9 +2896,7 @@ camel_url_scanner_scan
 <SECTION>
 <FILE>camel-url</FILE>
 CamelURL
-CAMEL_URL_HIDE_PASSWORD
-CAMEL_URL_HIDE_PARAMS
-CAMEL_URL_HIDE_AUTH
+CamelURLFlags
 CAMEL_URL_HIDE_ALL
 camel_url_new_with_base
 camel_url_new
diff --git a/docs/reference/camel/tmpl/camel-block-file.sgml b/docs/reference/camel/tmpl/camel-block-file.sgml
index 334dfb8b8..02f72d678 100644
--- a/docs/reference/camel/tmpl/camel-block-file.sgml
+++ b/docs/reference/camel/tmpl/camel-block-file.sgml
@@ -32,6 +32,21 @@ CamelKeyFile
 </para>
 
 
+<!-- ##### ENUM CamelBlockFileFlags ##### -->
+<para>
+
+</para>
+
+@CAMEL_BLOCK_FILE_SYNC: 
+
+<!-- ##### ENUM CamelBlockFlags ##### -->
+<para>
+
+</para>
+
+@CAMEL_BLOCK_DIRTY: 
+@CAMEL_BLOCK_DETACHED: 
+
 <!-- ##### STRUCT CamelBlockRoot ##### -->
 <para>
 
@@ -62,13 +77,6 @@ CamelKeyFile
 </para>
 
 
-<!-- ##### MACRO CAMEL_BLOCK_FILE_SYNC ##### -->
-<para>
-
-</para>
-
-
-
 <!-- ##### MACRO CAMEL_BLOCK_SIZE ##### -->
 <para>
 
@@ -83,20 +91,6 @@ CamelKeyFile
 
 
 
-<!-- ##### MACRO CAMEL_BLOCK_DIRTY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_BLOCK_DETACHED ##### -->
-<para>
-
-</para>
-
-
-
 <!-- ##### FUNCTION camel_block_file_new ##### -->
 <para>
 
diff --git a/docs/reference/camel/tmpl/camel-certdb.sgml b/docs/reference/camel/tmpl/camel-certdb.sgml
index 3f9a2ed33..536bce85d 100644
--- a/docs/reference/camel/tmpl/camel-certdb.sgml
+++ b/docs/reference/camel/tmpl/camel-certdb.sgml
@@ -20,6 +20,13 @@ CamelCertDB
 <!-- ##### SECTION Image ##### -->
 
 
+<!-- ##### ENUM CamelCertDBFlags ##### -->
+<para>
+
+</para>
+
+@CAMEL_CERTDB_DIRTY: 
+
 <!-- ##### STRUCT CamelCertDB ##### -->
 <para>
 
diff --git a/docs/reference/camel/tmpl/camel-folder.sgml b/docs/reference/camel/tmpl/camel-folder.sgml
index 1e7a86827..bd7c5bacc 100644
--- a/docs/reference/camel/tmpl/camel-folder.sgml
+++ b/docs/reference/camel/tmpl/camel-folder.sgml
@@ -20,6 +20,19 @@ CamelFolder
 <!-- ##### SECTION Image ##### -->
 
 
+<!-- ##### ENUM CamelFolderFlags ##### -->
+<para>
+
+</para>
+
+@CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY: 
+@CAMEL_FOLDER_HAS_SEARCH_CAPABILITY: 
+@CAMEL_FOLDER_FILTER_RECENT: 
+@CAMEL_FOLDER_HAS_BEEN_DELETED: 
+@CAMEL_FOLDER_IS_TRASH: 
+@CAMEL_FOLDER_IS_JUNK: 
+@CAMEL_FOLDER_FILTER_JUNK: 
+
 <!-- ##### STRUCT CamelFolder ##### -->
 <para>
 
@@ -111,55 +124,6 @@ CamelFolder
 @total: 
 @next: 
 
-<!-- ##### MACRO CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_FOLDER_HAS_SEARCH_CAPABILITY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_FOLDER_FILTER_RECENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_FOLDER_HAS_BEEN_DELETED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_FOLDER_IS_TRASH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_FOLDER_IS_JUNK ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_FOLDER_FILTER_JUNK ##### -->
-<para>
-
-</para>
-
-
-
 <!-- ##### FUNCTION camel_folder_set_lock_async ##### -->
 <para>
 
diff --git a/docs/reference/camel/tmpl/camel-provider.sgml b/docs/reference/camel/tmpl/camel-provider.sgml
index 7c071c960..7a0962c3c 100644
--- a/docs/reference/camel/tmpl/camel-provider.sgml
+++ b/docs/reference/camel/tmpl/camel-provider.sgml
@@ -52,68 +52,21 @@ camel-provider
 @CAMEL_PROVIDER_TRANSPORT: 
 @CAMEL_NUM_PROVIDER_TYPES: 
 
-<!-- ##### MACRO CAMEL_PROVIDER_IS_LOCAL ##### -->
+<!-- ##### ENUM CamelProviderFlags ##### -->
 <para>
 
 </para>
 
-
-
-<!-- ##### MACRO CAMEL_PROVIDER_IS_EXTERNAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_PROVIDER_IS_SOURCE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_PROVIDER_IS_STORAGE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_PROVIDER_SUPPORTS_SSL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_PROVIDER_HAS_LICENSE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_PROVIDER_DISABLE_SENT_FOLDER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_PROVIDER_ALLOW_REAL_TRASH_FOLDER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_PROVIDER_ALLOW_REAL_JUNK_FOLDER ##### -->
-<para>
-
-</para>
-
-
+@CAMEL_PROVIDER_IS_REMOTE: 
+@CAMEL_PROVIDER_IS_LOCAL: 
+@CAMEL_PROVIDER_IS_EXTERNAL: 
+@CAMEL_PROVIDER_IS_SOURCE: 
+@CAMEL_PROVIDER_IS_STORAGE: 
+@CAMEL_PROVIDER_SUPPORTS_SSL: 
+@CAMEL_PROVIDER_HAS_LICENSE: 
+@CAMEL_PROVIDER_DISABLE_SENT_FOLDER: 
+@CAMEL_PROVIDER_ALLOW_REAL_TRASH_FOLDER: 
+@CAMEL_PROVIDER_ALLOW_REAL_JUNK_FOLDER: 
 
 <!-- ##### MACRO CAMEL_URL_PART_USER ##### -->
 <para>
@@ -205,152 +158,32 @@ camel-provider
 @flags: 
 
 
-<!-- ##### MACRO CAMEL_URL_ALLOW_USER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_URL_ALLOW_AUTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_URL_ALLOW_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_URL_ALLOW_HOST ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_URL_ALLOW_PORT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_URL_ALLOW_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_URL_NEED_USER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_URL_NEED_AUTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_URL_NEED_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_URL_NEED_HOST ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_URL_NEED_PORT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_URL_NEED_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_URL_NEED_PATH_DIR ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_URL_HIDDEN_USER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_URL_HIDDEN_AUTH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_URL_HIDDEN_PASSWORD ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_URL_HIDDEN_HOST ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_URL_HIDDEN_PORT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_URL_HIDDEN_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_URL_FRAGMENT_IS_PATH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_URL_PATH_IS_ABSOLUTE ##### -->
-<para>
-
-</para>
-
-
+<!-- ##### ENUM CamelProviderURLFlags ##### -->
+<para>
+
+</para>
+
+@CAMEL_URL_ALLOW_USER: 
+@CAMEL_URL_ALLOW_AUTH: 
+@CAMEL_URL_ALLOW_PASSWORD: 
+@CAMEL_URL_ALLOW_HOST: 
+@CAMEL_URL_ALLOW_PORT: 
+@CAMEL_URL_ALLOW_PATH: 
+@CAMEL_URL_NEED_USER: 
+@CAMEL_URL_NEED_AUTH: 
+@CAMEL_URL_NEED_PASSWORD: 
+@CAMEL_URL_NEED_HOST: 
+@CAMEL_URL_NEED_PORT: 
+@CAMEL_URL_NEED_PATH: 
+@CAMEL_URL_NEED_PATH_DIR: 
+@CAMEL_URL_HIDDEN_USER: 
+@CAMEL_URL_HIDDEN_AUTH: 
+@CAMEL_URL_HIDDEN_PASSWORD: 
+@CAMEL_URL_HIDDEN_HOST: 
+@CAMEL_URL_HIDDEN_PORT: 
+@CAMEL_URL_HIDDEN_PATH: 
+@CAMEL_URL_FRAGMENT_IS_PATH: 
+@CAMEL_URL_PATH_IS_ABSOLUTE: 
 
 <!-- ##### MACRO CAMEL_PROVIDER_IS_STORE_AND_TRANSPORT ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-store.sgml b/docs/reference/camel/tmpl/camel-store.sgml
index e202298ef..744d0bdd1 100644
--- a/docs/reference/camel/tmpl/camel-store.sgml
+++ b/docs/reference/camel/tmpl/camel-store.sgml
@@ -90,91 +90,6 @@ CamelStore
 @CAMEL_STORE_ERROR_INVALID: 
 @CAMEL_STORE_ERROR_NO_FOLDER: 
 
-<!-- ##### STRUCT CamelFolderInfo ##### -->
-<para>
-
-</para>
-
-@next: 
-@parent: 
-@child: 
-@uri: 
-@name: 
-@full_name: 
-@flags: 
-@unread: 
-@total: 
-
-<!-- ##### MACRO CAMEL_FOLDER_NOSELECT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_FOLDER_NOINFERIORS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_FOLDER_CHILDREN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_FOLDER_NOCHILDREN ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_FOLDER_SUBSCRIBED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_FOLDER_VIRTUAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_FOLDER_SYSTEM ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_FOLDER_VTRASH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_FOLDER_SHARED_TO_ME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_FOLDER_SHARED_BY_ME ##### -->
-<para>
-
-</para>
-
-
-
 <!-- ##### MACRO CAMEL_FOLDER_TYPE_MASK ##### -->
 <para>
 
@@ -189,145 +104,74 @@ CamelStore
 
 
 
-<!-- ##### MACRO CAMEL_FOLDER_TYPE_NORMAL ##### -->
+<!-- ##### ENUM CamelFolderInfoFlags ##### -->
 <para>
 
 </para>
 
+@CAMEL_FOLDER_NOSELECT: 
+@CAMEL_FOLDER_NOINFERIORS: 
+@CAMEL_FOLDER_CHILDREN: 
+@CAMEL_FOLDER_NOCHILDREN: 
+@CAMEL_FOLDER_SUBSCRIBED: 
+@CAMEL_FOLDER_VIRTUAL: 
+@CAMEL_FOLDER_SYSTEM: 
+@CAMEL_FOLDER_VTRASH: 
+@CAMEL_FOLDER_SHARED_TO_ME: 
+@CAMEL_FOLDER_SHARED_BY_ME: 
+@CAMEL_FOLDER_TYPE_NORMAL: 
+@CAMEL_FOLDER_TYPE_INBOX: 
+@CAMEL_FOLDER_TYPE_OUTBOX: 
+@CAMEL_FOLDER_TYPE_TRASH: 
+@CAMEL_FOLDER_TYPE_JUNK: 
+@CAMEL_FOLDER_TYPE_SENT: 
 
-
-<!-- ##### MACRO CAMEL_FOLDER_TYPE_INBOX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_FOLDER_TYPE_OUTBOX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_FOLDER_TYPE_TRASH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_FOLDER_TYPE_JUNK ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_FOLDER_TYPE_SENT ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_STORE_READ ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_STORE_WRITE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_STORE_SUBSCRIPTIONS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_STORE_VTRASH ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_STORE_FILTER_INBOX ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_STORE_VJUNK ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_STORE_PROXY ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_STORE_IS_MIGRATING ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_STORE_ASYNC ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_STORE_REAL_JUNK_FOLDER ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_STORE_FOLDER_CREATE ##### -->
+<!-- ##### STRUCT CamelFolderInfo ##### -->
 <para>
 
 </para>
 
+@next: 
+@parent: 
+@child: 
+@uri: 
+@name: 
+@full_name: 
+@flags: 
+@unread: 
+@total: 
 
-
-<!-- ##### MACRO CAMEL_STORE_FOLDER_EXCL ##### -->
+<!-- ##### ENUM CamelStoreFlags ##### -->
 <para>
 
 </para>
 
+@CAMEL_STORE_SUBSCRIPTIONS: 
+@CAMEL_STORE_VTRASH: 
+@CAMEL_STORE_FILTER_INBOX: 
+@CAMEL_STORE_VJUNK: 
+@CAMEL_STORE_PROXY: 
+@CAMEL_STORE_IS_MIGRATING: 
+@CAMEL_STORE_ASYNC: 
+@CAMEL_STORE_REAL_JUNK_FOLDER: 
 
-
-<!-- ##### MACRO CAMEL_STORE_FOLDER_BODY_INDEX ##### -->
+<!-- ##### ENUM CamelStorePermissionFlags ##### -->
 <para>
 
 </para>
 
+@CAMEL_STORE_READ: 
+@CAMEL_STORE_WRITE: 
 
-
-<!-- ##### MACRO CAMEL_STORE_FOLDER_PRIVATE ##### -->
+<!-- ##### ENUM CamelStoreGetFolderFlags ##### -->
 <para>
 
 </para>
 
-
+@CAMEL_STORE_FOLDER_CREATE: 
+@CAMEL_STORE_FOLDER_EXCL: 
+@CAMEL_STORE_FOLDER_BODY_INDEX: 
+@CAMEL_STORE_FOLDER_PRIVATE: 
 
 <!-- ##### MACRO CAMEL_STORE_FOLDER_CREATE_EXCL ##### -->
 <para>
@@ -336,40 +180,16 @@ CamelStore
 
 
 
-<!-- ##### MACRO CAMEL_STORE_FOLDER_INFO_FAST ##### -->
+<!-- ##### ENUM CamelStoreGetFolderInfoFlags ##### -->
 <para>
 
 </para>
 
-
-
-<!-- ##### MACRO CAMEL_STORE_FOLDER_INFO_RECURSIVE ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_STORE_FOLDER_INFO_SUBSCRIBED ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_STORE_FOLDER_INFO_SUBSCRIPTION_LIST ##### -->
-<para>
-
-</para>
-
-
+@CAMEL_STORE_FOLDER_INFO_FAST: 
+@CAMEL_STORE_FOLDER_INFO_RECURSIVE: 
+@CAMEL_STORE_FOLDER_INFO_SUBSCRIBED: 
+@CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL: 
+@CAMEL_STORE_FOLDER_INFO_SUBSCRIPTION_LIST: 
 
 <!-- ##### FUNCTION camel_store_folder_created ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-tcp-stream-ssl.sgml b/docs/reference/camel/tmpl/camel-tcp-stream-ssl.sgml
index 57f53cd18..5f8945e8b 100644
--- a/docs/reference/camel/tmpl/camel-tcp-stream-ssl.sgml
+++ b/docs/reference/camel/tmpl/camel-tcp-stream-ssl.sgml
@@ -28,26 +28,14 @@ CamelTcpStreamSSL
 @parent_object: 
 @priv: 
 
-<!-- ##### MACRO CAMEL_TCP_STREAM_SSL_ENABLE_SSL2 ##### -->
+<!-- ##### ENUM CamelTcpStreamSSLFlags ##### -->
 <para>
 
 </para>
 
-
-
-<!-- ##### MACRO CAMEL_TCP_STREAM_SSL_ENABLE_SSL3 ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_TCP_STREAM_SSL_ENABLE_TLS ##### -->
-<para>
-
-</para>
-
-
+@CAMEL_TCP_STREAM_SSL_ENABLE_SSL2: 
+@CAMEL_TCP_STREAM_SSL_ENABLE_SSL3: 
+@CAMEL_TCP_STREAM_SSL_ENABLE_TLS: 
 
 <!-- ##### FUNCTION camel_tcp_stream_ssl_new ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-unused.sgml b/docs/reference/camel/tmpl/camel-unused.sgml
index cadb274c7..dd83b6ceb 100644
--- a/docs/reference/camel/tmpl/camel-unused.sgml
+++ b/docs/reference/camel/tmpl/camel-unused.sgml
@@ -2288,6 +2288,24 @@ streams
 </para>
 
 
+<!-- ##### MACRO CAMEL_BLOCK_DETACHED ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_BLOCK_DIRTY ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_BLOCK_FILE_SYNC ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### MACRO CAMEL_CHECK_CAST ##### -->
 <para>
 
@@ -2328,6 +2346,144 @@ streams
 </para>
 
 
+<!-- ##### MACRO CAMEL_FOLDER_CHILDREN ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_FOLDER_FILTER_JUNK ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_FOLDER_FILTER_RECENT ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_FOLDER_HAS_BEEN_DELETED ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_FOLDER_HAS_SEARCH_CAPABILITY ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_FOLDER_IS_JUNK ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_FOLDER_IS_TRASH ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_FOLDER_NOCHILDREN ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_FOLDER_NOINFERIORS ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_FOLDER_NOSELECT ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_FOLDER_SHARED_BY_ME ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_FOLDER_SHARED_TO_ME ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_FOLDER_SUBSCRIBED ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_FOLDER_SYSTEM ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_FOLDER_TYPE_INBOX ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_FOLDER_TYPE_JUNK ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_FOLDER_TYPE_NORMAL ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_FOLDER_TYPE_OUTBOX ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_FOLDER_TYPE_SENT ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_FOLDER_TYPE_TRASH ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_FOLDER_VIRTUAL ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_FOLDER_VTRASH ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### MACRO CAMEL_GROUPWISE_FOLDER_LOCK ##### -->
 <para>
 
@@ -2618,6 +2774,60 @@ streams
 </para>
 
 
+<!-- ##### MACRO CAMEL_PROVIDER_ALLOW_REAL_JUNK_FOLDER ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_PROVIDER_ALLOW_REAL_TRASH_FOLDER ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_PROVIDER_DISABLE_SENT_FOLDER ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_PROVIDER_HAS_LICENSE ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_PROVIDER_IS_EXTERNAL ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_PROVIDER_IS_LOCAL ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_PROVIDER_IS_SOURCE ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_PROVIDER_IS_STORAGE ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_PROVIDER_SUPPORTS_SSL ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### MACRO CAMEL_SERVICE_AUTH ##### -->
 <para>
 
@@ -2678,6 +2888,282 @@ streams
 </para>
 
 
+<!-- ##### MACRO CAMEL_STORE_ASYNC ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_STORE_FILTER_INBOX ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_STORE_FOLDER_BODY_INDEX ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_STORE_FOLDER_CREATE ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_STORE_FOLDER_EXCL ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_STORE_FOLDER_INFO_FAST ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_STORE_FOLDER_INFO_RECURSIVE ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_STORE_FOLDER_INFO_SUBSCRIBED ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_STORE_FOLDER_INFO_SUBSCRIPTION_LIST ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_STORE_FOLDER_PRIVATE ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_STORE_IS_MIGRATING ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_STORE_PROXY ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_STORE_READ ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_STORE_REAL_JUNK_FOLDER ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_STORE_SUBSCRIPTIONS ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_STORE_VJUNK ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_STORE_VTRASH ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_STORE_WRITE ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_TCP_STREAM_SSL_ENABLE_SSL2 ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_TCP_STREAM_SSL_ENABLE_SSL3 ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_TCP_STREAM_SSL_ENABLE_TLS ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_ALLOW_AUTH ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_ALLOW_HOST ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_ALLOW_PASSWORD ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_ALLOW_PATH ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_ALLOW_PORT ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_ALLOW_USER ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_FRAGMENT_IS_PATH ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_HIDDEN_AUTH ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_HIDDEN_HOST ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_HIDDEN_PASSWORD ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_HIDDEN_PATH ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_HIDDEN_PORT ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_HIDDEN_USER ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_HIDE_AUTH ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_HIDE_PARAMS ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_HIDE_PASSWORD ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_NEED_AUTH ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_NEED_HOST ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_NEED_PASSWORD ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_NEED_PATH ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_NEED_PATH_DIR ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_NEED_PORT ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_NEED_USER ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO CAMEL_URL_PATH_IS_ABSOLUTE ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### STRUCT CamelArg ##### -->
 <para>
 
diff --git a/docs/reference/camel/tmpl/camel-url.sgml b/docs/reference/camel/tmpl/camel-url.sgml
index f69c78164..e9cbb5205 100644
--- a/docs/reference/camel/tmpl/camel-url.sgml
+++ b/docs/reference/camel/tmpl/camel-url.sgml
@@ -36,26 +36,14 @@ camel-url
 @query: 
 @fragment: 
 
-<!-- ##### MACRO CAMEL_URL_HIDE_PASSWORD ##### -->
+<!-- ##### ENUM CamelURLFlags ##### -->
 <para>
 
 </para>
 
-
-
-<!-- ##### MACRO CAMEL_URL_HIDE_PARAMS ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO CAMEL_URL_HIDE_AUTH ##### -->
-<para>
-
-</para>
-
-
+@CAMEL_URL_HIDE_PASSWORD: 
+@CAMEL_URL_HIDE_PARAMS: 
+@CAMEL_URL_HIDE_AUTH: 
 
 <!-- ##### MACRO CAMEL_URL_HIDE_ALL ##### -->
 <para>