[evolution-data-server] Further API doc cleanups.



commit 8709051dfc436cef096d239ed2ebfb20265885e5
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Dec 27 10:14:51 2012 -0500

    Further API doc cleanups.

 docs/reference/addressbook/libebook/Makefile.am    |    2 +-
 .../addressbook/libebook/libebook-sections.txt     |    8 +-
 .../addressbook/libedata-book/Makefile.am          |    2 +-
 .../libedata-book/libedata-book-sections.txt       |   32 ++--
 docs/reference/calendar/libecal/Makefile.am        |    2 +-
 .../calendar/libecal/libecal-sections.txt          |    8 +-
 docs/reference/calendar/libedata-cal/Makefile.am   |    5 +-
 .../libedata-cal/libedata-cal-sections.txt         |   27 ++--
 docs/reference/camel/Makefile.am                   |    3 +-
 docs/reference/camel/camel-sections.txt            |  193 +++++++++-----------
 docs/reference/libebackend/Makefile.am             |    2 +-
 .../reference/libebackend/libebackend-sections.txt |   41 ++--
 docs/reference/libedataserver/Makefile.am          |    2 +-
 .../libedataserver/libedataserver-sections.txt     |   86 +++++----
 docs/reference/private/Makefile.am                 |    2 +-
 libedataserver/e-data-server-util.h                |    2 +-
 16 files changed, 204 insertions(+), 213 deletions(-)
---
diff --git a/docs/reference/addressbook/libebook/Makefile.am b/docs/reference/addressbook/libebook/Makefile.am
index c8d24aa..1d96640 100644
--- a/docs/reference/addressbook/libebook/Makefile.am
+++ b/docs/reference/addressbook/libebook/Makefile.am
@@ -2,7 +2,7 @@
 DOC_MODULE = libebook
 
 # The top-level SGML file.
-DOC_MAIN_SGML_FILE = libebook-docs.sgml
+DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
 
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS = --deprecated-guards="EDS_DISABLE_DEPRECATED"
diff --git a/docs/reference/addressbook/libebook/libebook-sections.txt b/docs/reference/addressbook/libebook/libebook-sections.txt
index cace685..ce23d7f 100644
--- a/docs/reference/addressbook/libebook/libebook-sections.txt
+++ b/docs/reference/addressbook/libebook/libebook-sections.txt
@@ -10,10 +10,10 @@ EBookViewClass
 E_BOOK_VIEW
 E_IS_BOOK_VIEW
 E_TYPE_BOOK_VIEW
-e_book_view_get_type
 E_BOOK_VIEW_CLASS
 E_IS_BOOK_VIEW_CLASS
 E_BOOK_VIEW_GET_CLASS
+e_book_view_get_type
 <SUBSECTION Private>
 EBookViewPrivate
 </SECTION>
@@ -100,10 +100,10 @@ EBookClass
 E_BOOK
 E_IS_BOOK
 E_TYPE_BOOK
-e_book_get_type
 E_BOOK_CLASS
 E_IS_BOOK_CLASS
 E_BOOK_GET_CLASS
+e_book_get_type
 <SUBSECTION Private>
 EBookPrivate
 </SECTION>
@@ -264,6 +264,7 @@ E_TYPE_CONTACT_ATTR_LIST
 e_contact_get_type
 e_contact_address_get_type
 e_contact_cert_get_type
+e_contact_geo_get_type
 e_contact_photo_get_type
 e_contact_name_get_type
 e_contact_date_get_type
@@ -271,7 +272,6 @@ e_contact_attr_list_get_type
 EContactPhotoType
 <SUBSECTION Private>
 EContactPrivate
-e_contact_geo_get_type
 </SECTION>
 
 <SECTION>
@@ -545,7 +545,7 @@ E_SOURCE_BACKEND_SUMMARY_SETUP_CLASS
 E_IS_SOURCE_BACKEND_SUMMARY_SETUP_CLASS
 E_SOURCE_BACKEND_SUMMARY_SETUP_GET_CLASS
 ESourceBackendSummarySetupClass
+e_source_backend_summary_setup_get_type
 <SUBSECTION Private>
 ESourceBackendSummarySetupPrivate
-e_source_backend_summary_setup_get_type
 </SECTION>
diff --git a/docs/reference/addressbook/libedata-book/Makefile.am b/docs/reference/addressbook/libedata-book/Makefile.am
index 9003173..e984856 100644
--- a/docs/reference/addressbook/libedata-book/Makefile.am
+++ b/docs/reference/addressbook/libedata-book/Makefile.am
@@ -2,7 +2,7 @@
 DOC_MODULE = libedata-book
 
 # The top-level SGML file.
-DOC_MAIN_SGML_FILE = libedata-book-docs.sgml
+DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
 
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS = --deprecated-guards="EDS_DISABLE_DEPRECATED"
diff --git a/docs/reference/addressbook/libedata-book/libedata-book-sections.txt b/docs/reference/addressbook/libedata-book/libedata-book-sections.txt
index ece4460..9ee3747 100644
--- a/docs/reference/addressbook/libedata-book/libedata-book-sections.txt
+++ b/docs/reference/addressbook/libedata-book/libedata-book-sections.txt
@@ -56,9 +56,9 @@ E_BOOK_BACKEND_CLASS
 E_IS_BOOK_BACKEND_CLASS
 E_BOOK_BACKEND_GET_CLASS
 EBookBackendClass
+e_book_backend_get_type
 <SUBSECTION Private>
 EBookBackendPrivate
-e_book_backend_get_type
 </SECTION>
 
 <SECTION>
@@ -84,9 +84,9 @@ E_BOOK_BACKEND_CACHE_CLASS
 E_IS_BOOK_BACKEND_CACHE_CLASS
 E_BOOK_BACKEND_CACHE_GET_CLASS
 EBookBackendCacheClass
+e_book_backend_cache_get_type
 <SUBSECTION Private>
 EBookBackendCachePrivate
-e_book_backend_cache_get_type
 </SECTION>
 
 <SECTION>
@@ -118,9 +118,9 @@ E_BOOK_BACKEND_FACTORY_CLASS
 E_IS_BOOK_BACKEND_FACTORY_CLASS
 E_BOOK_BACKEND_FACTORY_GET_CLASS
 EBookBackendFactoryClass
+e_book_backend_factory_get_type
 <SUBSECTION Private>
 EBookBackendFactoryPrivate
-e_book_backend_factory_get_type
 </SECTION>
 
 <SECTION>
@@ -133,22 +133,15 @@ e_book_backend_sexp_match_vcard
 e_book_backend_sexp_match_contact
 <SUBSECTION Standard>
 E_BOOK_BACKEND_SEXP
-E_IS_BACKEND_SEXP
-E_TYPE_BACKEND_SEXP
-E_BOOK_BACKEND_SEXP_CLASS
-E_IS_BACKEND_SEXP_CLASS
-E_BOOK_BACKEND_SEXP_GET_CLASS
-EBookBackendSExpClass
-<SUBSECTION Standard>
-E_BOOK_BACKEND_SEXP
 E_IS_BOOK_BACKEND_SEXP
 E_TYPE_BOOK_BACKEND_SEXP
 E_BOOK_BACKEND_SEXP_CLASS
 E_IS_BOOK_BACKEND_SEXP_CLASS
 E_BOOK_BACKEND_SEXP_GET_CLASS
+EBookBackendSExpClass
+e_book_backend_sexp_get_type
 <SUBSECTION Private>
 EBookBackendSExpPrivate
-e_book_backend_sexp_get_type
 </SECTION>
 
 <SECTION>
@@ -226,9 +219,9 @@ E_BOOK_BACKEND_SUMMARY_CLASS
 E_IS_BOOK_BACKEND_SUMMARY_CLASS
 E_BOOK_BACKEND_SUMMARY_GET_CLASS
 EBookBackendSummaryClass
+e_book_backend_summary_get_type
 <SUBSECTION Private>
 EBookBackendSummaryPrivate
-e_book_backend_summary_get_type
 </SECTION>
 
 <SECTION>
@@ -254,9 +247,9 @@ E_BOOK_BACKEND_SYNC_CLASS
 E_IS_BOOK_BACKEND_SYNC_CLASS
 E_BOOK_BACKEND_SYNC_GET_CLASS
 EBookBackendSyncClass
+e_book_backend_sync_get_type
 <SUBSECTION Private>
 EBookBackendSyncPrivate
-e_book_backend_sync_get_type
 </SECTION>
 
 <SECTION>
@@ -300,18 +293,19 @@ E_TYPE_DATA_BOOK_CHANGE_TYPE
 E_TYPE_DATA_BOOK_MODE
 E_TYPE_DATA_BOOK_STATUS
 EDataBookClass
-<SUBSECTION Private>
-EDataBookPrivate
 e_data_book_get_type
-e_data_book_error_quark
 e_data_book_change_type_get_type
 e_data_book_mode_get_type
 e_data_book_status_get_type
+<SUBSECTION Private>
+EDataBookPrivate
+e_data_book_error_quark
 </SECTION>
 
 <SECTION>
 <FILE>e-data-book-factory</FILE>
 <TITLE>EDataBookFactory</TITLE>
+EDS_ADDRESS_BOOK_MODULES
 EDataBookFactory
 e_data_book_factory_new
 e_data_book_factory_get_registry
@@ -323,9 +317,9 @@ E_DATA_BOOK_FACTORY_CLASS
 E_IS_DATA_BOOK_FACTORY_CLASS
 E_DATA_BOOK_FACTORY_GET_CLASS
 EDataBookFactoryClass
+e_data_book_factory_get_type
 <SUBSECTION Private>
 EDataBookFactoryPrivate
-e_data_book_factory_get_type
 </SECTION>
 
 <SECTION>
@@ -353,9 +347,9 @@ E_DATA_BOOK_VIEW_CLASS
 E_IS_DATA_BOOK_VIEW_CLASS
 E_DATA_BOOK_VIEW_GET_CLASS
 EDataBookViewClass
+e_data_book_view_get_type
 <SUBSECTION Private>
 EDataBookViewPrivate
-e_data_book_view_get_type
 </SECTION>
 
 <SECTION>
diff --git a/docs/reference/calendar/libecal/Makefile.am b/docs/reference/calendar/libecal/Makefile.am
index f23864a..b8fa346 100644
--- a/docs/reference/calendar/libecal/Makefile.am
+++ b/docs/reference/calendar/libecal/Makefile.am
@@ -2,7 +2,7 @@
 DOC_MODULE = libecal
 
 # The top-level SGML file.
-DOC_MAIN_SGML_FILE = libecal-docs.sgml
+DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
 
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS = --deprecated-guards="EDS_DISABLE_DEPRECATED"
diff --git a/docs/reference/calendar/libecal/libecal-sections.txt b/docs/reference/calendar/libecal/libecal-sections.txt
index 03ac423..e174fc2 100644
--- a/docs/reference/calendar/libecal/libecal-sections.txt
+++ b/docs/reference/calendar/libecal/libecal-sections.txt
@@ -67,12 +67,12 @@ E_TYPE_CAL_SOURCE_TYPE
 E_CAL_SET_MODE_STATUS_ENUM_TYPE
 CAL_MODE_ENUM_TYPE
 ECalClass
-<SUBSECTION Private>
-ECalPrivate
 e_cal_get_type
 e_cal_set_mode_status_enum_get_type
 e_cal_source_type_enum_get_type
 cal_mode_enum_get_type
+<SUBSECTION Private>
+ECalPrivate
 </SECTION>
 
 <SECTION>
@@ -380,9 +380,9 @@ E_TYPE_CAL_COMPONENT
 E_CAL_COMPONENT_CLASS
 E_IS_CAL_COMPONENT_CLASS
 ECalComponentClass
+e_cal_component_get_type
 <SUBSECTION Private>
 ECalComponentPrivate
-e_cal_component_get_type
 </SECTION>
 
 <SECTION>
@@ -517,9 +517,9 @@ E_CAL_VIEW_CLASS
 E_IS_CAL_VIEW_CLASS
 E_CAL_VIEW_GET_CLASS
 ECalViewClass
+e_cal_view_get_type
 <SUBSECTION Private>
 ECalViewPrivate
-e_cal_view_get_type
 e_cal_view_new
 </SECTION>
 
diff --git a/docs/reference/calendar/libedata-cal/Makefile.am b/docs/reference/calendar/libedata-cal/Makefile.am
index b85eb65..6769724 100644
--- a/docs/reference/calendar/libedata-cal/Makefile.am
+++ b/docs/reference/calendar/libedata-cal/Makefile.am
@@ -2,11 +2,8 @@
 # The name of the module.
 DOC_MODULE = libedata-cal
 
-content_files=
-HTML_IMAGES=
-
 # The top-level SGML file.
-DOC_MAIN_SGML_FILE = libedata-cal-docs.sgml
+DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
 
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS = --deprecated-guards="EDS_DISABLE_DEPRECATED"
diff --git a/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt b/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt
index 4637e1b..e36c04e 100644
--- a/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt
+++ b/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt
@@ -66,9 +66,9 @@ E_CAL_BACKEND_CLASS
 E_IS_CAL_BACKEND_CLASS
 E_CAL_BACKEND_GET_CLASS
 ECalBackendClass
+e_cal_backend_get_type
 <SUBSECTION Private>
 ECalBackendPrivate
-e_cal_backend_get_type
 </SECTION>
 
 <SECTION>
@@ -102,9 +102,9 @@ E_CAL_BACKEND_CACHE_CLASS
 E_IS_CAL_BACKEND_CACHE_CLASS
 E_CAL_BACKEND_CACHE_GET_CLASS
 ECalBackendCacheClass
+e_cal_backend_cache_get_type
 <SUBSECTION Private>
 ECalBackendCachePrivate
-e_cal_backend_cache_get_type
 </SECTION>
 
 <SECTION>
@@ -119,9 +119,9 @@ E_CAL_BACKEND_FACTORY_CLASS
 E_IS_CAL_BACKEND_FACTORY_CLASS
 E_CAL_BACKEND_FACTORY_GET_CLASS
 ECalBackendFactoryClass
+e_cal_backend_factory_get_type
 <SUBSECTION Private>
 ECalBackendFactoryPrivate
-e_cal_backend_factory_get_type
 </SECTION>
 
 <SECTION>
@@ -137,9 +137,9 @@ E_CAL_BACKEND_FILE_STORE_CLASS
 E_IS_CAL_BACKEND_FILE_STORE_CLASS
 E_CAL_BACKEND_FILE_STORE_GET_CLASS
 ECalBackendFileStoreClass
+e_cal_backend_file_store_get_type
 <SUBSECTION Private>
 ECalBackendFileStorePrivate
-e_cal_backend_file_store_get_type
 </SECTION>
 
 <SECTION>
@@ -178,9 +178,9 @@ E_CAL_BACKEND_STORE_CLASS
 E_IS_CAL_BACKEND_STORE_CLASS
 E_CAL_BACKEND_STORE_GET_CLASS
 ECalBackendStoreClass
+e_cal_backend_store_get_type
 <SUBSECTION Private>
 ECalBackendStorePrivate
-e_cal_backend_store_get_type
 </SECTION>
 
 <SECTION>
@@ -203,9 +203,9 @@ E_TYPE_CAL_BACKEND_SEXP
 E_CAL_BACKEND_SEXP_CLASS
 E_IS_CAL_BACKEND_SEXP_CLASS
 E_CAL_BACKEND_SEXP_GET_CLASS
+e_cal_backend_sexp_get_type
 <SUBSECTION Private>
 ECalBackendSExpPrivate
-e_cal_backend_sexp_get_type
 </SECTION>
 
 <SECTION>
@@ -237,9 +237,9 @@ E_CAL_BACKEND_SYNC_CLASS
 E_IS_CAL_BACKEND_SYNC_CLASS
 E_CAL_BACKEND_SYNC_GET_CLASS
 ECalBackendSyncClass
+e_cal_backend_sync_get_type
 <SUBSECTION Private>
 ECalBackendSyncPrivate
-e_cal_backend_sync_get_type
 </SECTION>
 
 <SECTION>
@@ -300,15 +300,15 @@ E_TYPE_DATA_CAL_OBJ_MOD_TYPE
 E_TYPE_DATA_CAL_OBJ_TYPE
 E_TYPE_DATA_CAL_VIEW_LISTENER_SET_MODE_STATUS
 EDataCalClass
-<SUBSECTION Private>
-EDataCalPrivate
 e_data_cal_get_type
-e_data_cal_error_quark
 e_data_cal_call_status_get_type
 e_data_cal_mode_get_type
 e_data_cal_obj_mod_type_get_type
 e_data_cal_obj_type_get_type
 e_data_cal_view_listener_set_mode_status_get_type
+<SUBSECTION Private>
+EDataCalPrivate
+e_data_cal_error_quark
 </SECTION>
 
 <SECTION>
@@ -320,6 +320,7 @@ ECalBackendSExpClass
 <SECTION>
 <FILE>e-data-cal-factory</FILE>
 <TITLE>EDataCalFactory</TITLE>
+EDS_CALENDAR_MODULES
 EDataCalFactory
 e_data_cal_factory_new
 e_data_cal_factory_get_registry
@@ -331,9 +332,9 @@ E_DATA_CAL_FACTORY_CLASS
 E_IS_DATA_CAL_FACTORY_CLASS
 E_DATA_CAL_FACTORY_GET_CLASS
 EDataCalFactoryClass
+e_data_cal_factory_get_type
 <SUBSECTION Private>
 EDataCalFactoryPrivate
-e_data_cal_factory_get_type
 </SECTION>
 
 <SECTION>
@@ -371,9 +372,9 @@ E_TYPE_DATA_CAL_VIEW
 E_DATA_CAL_VIEW_CLASS
 E_IS_DATA_CAL_VIEW_CLASS
 E_DATA_CAL_VIEW_GET_CLASS
+e_data_cal_view_get_type
 <SUBSECTION Private>
 EDataCalViewPrivate
-e_data_cal_view_get_type
 </SECTION>
 
 <SECTION>
@@ -393,10 +394,10 @@ E_INTERVALTREE_CLASS
 E_IS_INTERVALTREE_CLASS
 E_INTERVALTREE_GET_CLASS
 EIntervalTreeClass
+e_intervaltree_get_type
 <SUBSECTION Private>
 E_INTERVALTREE_DEBUG
 EIntervalTreePrivate
-e_intervaltree_get_type
 e_intervaltree_dump
 </SECTION>
 
diff --git a/docs/reference/camel/Makefile.am b/docs/reference/camel/Makefile.am
index 559ed03..076fe31 100644
--- a/docs/reference/camel/Makefile.am
+++ b/docs/reference/camel/Makefile.am
@@ -1,9 +1,8 @@
 # The name of the module.
 DOC_MODULE = camel
-DOC_MODULE_VERSIONED = $(DOC_MODULE)-$(CAMEL_MAJOR_VERSION).$(CAMEL_MINOR_VERSION)
 
 # The top-level SGML file.
-DOC_MAIN_SGML_FILE = camel-docs.sgml
+DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
 
 # The directory containing the source code (if it contains documentation).
 DOC_SOURCE_DIR = $(top_srcdir)/camel
diff --git a/docs/reference/camel/camel-sections.txt b/docs/reference/camel/camel-sections.txt
index 96b70d1..7645f03 100644
--- a/docs/reference/camel/camel-sections.txt
+++ b/docs/reference/camel/camel-sections.txt
@@ -20,9 +20,9 @@ CAMEL_ADDRESS_CLASS
 CAMEL_IS_ADDRESS_CLASS
 CAMEL_ADDRESS_GET_CLASS
 CamelAddressClass
+camel_address_get_type
 <SUBSECTION Private>
 CamelAddressPrivate
-camel_address_get_type
 </SECTION>
 
 <SECTION>
@@ -71,11 +71,11 @@ CAMEL_IS_KEY_FILE_CLASS
 CAMEL_KEY_FILE_GET_CLASS
 CamelBlockFileClass
 CamelKeyFileClass
+camel_block_file_get_type
+camel_key_file_get_type
 <SUBSECTION Private>
 CamelBlockFilePrivate
 CamelKeyFilePrivate
-camel_block_file_get_type
-camel_key_file_get_type
 </SECTION>
 
 <SECTION>
@@ -122,9 +122,9 @@ CAMEL_CERTDB_CLASS
 CAMEL_IS_CERTDB_CLASS
 CAMEL_CERTDB_GET_CLASS
 CamelCertDBClass
+camel_certdb_get_type
 <SUBSECTION Private>
 CamelCertDBPrivate
-camel_certdb_get_type
 </SECTION>
 
 <SECTION>
@@ -180,9 +180,9 @@ CAMEL_CIPHER_CONTEXT_CLASS
 CAMEL_IS_CIPHER_CONTEXT_CLASS
 CAMEL_CIPHER_CONTEXT_GET_CLASS
 CamelCipherContextClass
+camel_cipher_context_get_type
 <SUBSECTION Private>
 CamelCipherContextPrivate
-camel_cipher_context_get_type
 </SECTION>
 
 <SECTION>
@@ -207,9 +207,9 @@ CAMEL_DATA_CACHE_CLASS
 CAMEL_IS_DATA_CACHE_CLASS
 CAMEL_DATA_CACHE_GET_CLASS
 CamelDataCacheClass
+camel_data_cache_get_type
 <SUBSECTION Private>
 CamelDataCachePrivate
-camel_data_cache_get_type
 </SECTION>
 
 <SECTION>
@@ -243,9 +243,9 @@ CAMEL_DATA_WRAPPER_CLASS
 CAMEL_IS_DATA_WRAPPER_CLASS
 CAMEL_DATA_WRAPPER_GET_CLASS
 CamelDataWrapperClass
+camel_data_wrapper_get_type
 <SUBSECTION Private>
 CamelDataWrapperPrivate
-camel_data_wrapper_get_type
 </SECTION>
 
 <SECTION>
@@ -333,8 +333,8 @@ CAMEL_DISCO_DIARY_CLASS
 CAMEL_IS_DISCO_DIARY_CLASS
 CAMEL_DISCO_DIARY_GET_CLASS
 CamelDiscoDiaryClass
-<SUBSECTION Private>
 camel_disco_diary_get_type
+<SUBSECTION Private>
 </SECTION>
 
 <SECTION>
@@ -354,9 +354,9 @@ CAMEL_DISCO_FOLDER_CLASS
 CAMEL_IS_DISCO_FOLDER_CLASS
 CAMEL_DISCO_FOLDER_GET_CLASS
 CamelDiscoFolderClass
+camel_disco_folder_get_type
 <SUBSECTION Private>
 CamelDiscoFolderPrivate
-camel_disco_folder_get_type
 </SECTION>
 
 <SECTION>
@@ -377,9 +377,9 @@ CAMEL_DISCO_STORE_CLASS
 CAMEL_IS_DISCO_STORE_CLASS
 CAMEL_DISCO_STORE_GET_CLASS
 CamelDiscoStoreClass
+camel_disco_store_get_type
 <SUBSECTION Private>
 CamelDiscoStorePrivate
-camel_disco_store_get_type
 </SECTION>
 
 <SECTION>
@@ -409,9 +409,9 @@ CAMEL_FILTER_DRIVER_CLASS
 CAMEL_IS_FILTER_DRIVER_CLASS
 CAMEL_FILTER_DRIVER_GET_CLASS
 CamelFilterDriverClass
+camel_filter_driver_get_type
 <SUBSECTION Private>
 CamelFilterDriverPrivate
-camel_filter_driver_get_type
 </SECTION>
 
 <SECTION>
@@ -530,10 +530,10 @@ CAMEL_FOLDER_CLASS
 CAMEL_IS_FOLDER_CLASS
 CAMEL_FOLDER_GET_CLASS
 CamelFolderClass
+camel_folder_get_type
 <SUBSECTION Private>
 CamelFolderPrivate
 CamelFolderChangeInfoPrivate
-camel_folder_get_type
 camel_folder_error_quark
 </SECTION>
 
@@ -558,9 +558,9 @@ CAMEL_FOLDER_SEARCH_CLASS
 CAMEL_IS_FOLDER_SEARCH_CLASS
 CAMEL_FOLDER_SEARCH_GET_CLASS
 CamelFolderSearchClass
+camel_folder_search_get_type
 <SUBSECTION Private>
 CamelFolderSearchPrivate
-camel_folder_search_get_type
 </SECTION>
 
 <SECTION>
@@ -683,9 +683,9 @@ CAMEL_FOLDER_SUMMARY_CLASS
 CAMEL_IS_FOLDER_SUMMARY_CLASS
 CAMEL_FOLDER_SUMMARY_GET_CLASS
 CamelFolderSummaryClass
+camel_folder_summary_get_type
 <SUBSECTION Private>
 CamelFolderSummaryPrivate
-camel_folder_summary_get_type
 </SECTION>
 
 <SECTION>
@@ -703,9 +703,9 @@ CAMEL_GPG_CONTEXT_CLASS
 CAMEL_IS_GPG_CONTEXT_CLASS
 CAMEL_GPG_CONTEXT_GET_CLASS
 CamelGpgContextClass
+camel_gpg_context_get_type
 <SUBSECTION Private>
 CamelGpgContextPrivate
-camel_gpg_context_get_type
 </SECTION>
 
 <SECTION>
@@ -728,9 +728,9 @@ CAMEL_HTML_PARSER_CLASS
 CAMEL_IS_HTML_PARSER_CLASS
 CAMEL_HTML_PARSER_GET_CLASS
 CamelHTMLParserClass
+camel_html_parser_get_type
 <SUBSECTION Private>
 CamelHTMLParserPrivate
-camel_html_parser_get_type
 </SECTION>
 
 <SECTION>
@@ -787,9 +787,9 @@ CAMEL_IMAPX_CONN_MANAGER_CLASS
 CAMEL_IS_IMAPX_CONN_MANAGER_CLASS
 CAMEL_IMAPX_CONN_MANAGER_GET_CLASS
 CamelIMAPXConnManagerClass
+camel_imapx_conn_manager_get_type
 <SUBSECTION Private>
 CamelIMAPXConnManagerPrivate
-camel_imapx_conn_manager_get_type
 </SECTION>
 
 <SECTION>
@@ -809,9 +809,9 @@ CAMEL_IMAPX_FOLDER_CLASS
 CAMEL_IS_IMAPX_FOLDER_CLASS
 CAMEL_IMAPX_FOLDER_GET_CLASS
 CamelIMAPXFolderClass
+camel_imapx_folder_get_type
 <SUBSECTION Private>
 CamelIMAPXFolderPrivate
-camel_imapx_folder_get_type
 </SECTION>
 
 <SECTION>
@@ -895,12 +895,12 @@ CAMEL_IMAPX_SERVER_CLASS
 CAMEL_IS_IMAPX_SERVER_CLASS
 CAMEL_IMAPX_SERVER_GET_CLASS
 CamelIMAPXServerClass
+camel_imapx_server_get_type
 <SUBSECTION Private>
 IMAPX_MODE_READ
 IMAPX_MODE_WRITE
 CamelIMAPXIdle
 CamelIMAPXServerPrivate
-camel_imapx_server_get_type
 imapx_connect_to_server
 </SECTION>
 
@@ -960,9 +960,9 @@ CAMEL_IMAPX_SETTINGS_CLASS
 CAMEL_IS_IMAPX_SETTINGS_CLASS
 CAMEL_IMAPX_SETTINGS_GET_CLASS
 CamelIMAPXSettingsClass
+camel_imapx_settings_get_type
 <SUBSECTION Private>
 CamelIMAPXSettingsPrivate
-camel_imapx_settings_get_type
 </SECTION>
 
 <SECTION>
@@ -981,9 +981,9 @@ CAMEL_IMAPX_STORE_CLASS
 CAMEL_IS_IMAPX_STORE_CLASS
 CAMEL_IMAPX_STORE_GET_CLASS
 CamelIMAPXStoreClass
+camel_imapx_store_get_type
 <SUBSECTION Private>
 CamelIMAPXStorePrivate
-camel_imapx_store_get_type
 </SECTION>
 
 <SECTION>
@@ -1013,7 +1013,6 @@ CAMEL_IMAPX_STORE_SUMMARY_CLASS
 CAMEL_IS_IMAPX_STORE_SUMMARY_CLASS
 CAMEL_IMAPX_STORE_SUMMARY_GET_CLASS
 CamelIMAPXStoreSummaryClass
-<SUBSECTION Private>
 camel_imapx_store_summary_get_type
 </SECTION>
 
@@ -1047,9 +1046,9 @@ CAMEL_IMAPX_STREAM_CLASS
 CAMEL_IS_IMAPX_STREAM_CLASS
 CAMEL_IMAPX_STREAM_GET_CLASS
 CamelIMAPXStreamClass
+camel_imapx_stream_get_type
 <SUBSECTION Private>
 CamelIMAPXStreamPrivate
-camel_imapx_stream_get_type
 </SECTION>
 
 <SECTION>
@@ -1070,7 +1069,6 @@ CAMEL_IMAPX_SUMMARY_CLASS
 CAMEL_IS_IMAPX_SUMMARY_CLASS
 CAMEL_IMAPX_SUMMARY_GET_CLASS
 CamelIMAPXSummaryClass
-<SUBSECTION Private>
 camel_imapx_summary_get_type
 </SECTION>
 
@@ -1127,13 +1125,13 @@ CAMEL_INDEX_CURSOR_GET_CLASS
 CamelIndexClass
 CamelIndexCursorClass
 CamelIndexNameClass
+camel_index_get_type
+camel_index_name_get_type
+camel_index_cursor_get_type
 <SUBSECTION Private>
 CamelIndexPrivate
 CamelIndexNamePrivate
 CamelIndexCursorPrivate
-camel_index_get_type
-camel_index_name_get_type
-camel_index_cursor_get_type
 </SECTION>
 
 <SECTION>
@@ -1155,9 +1153,9 @@ CAMEL_INTERNET_ADDRESS_CLASS
 CAMEL_IS_INTERNET_ADDRESS_CLASS
 CAMEL_INTERNET_ADDRESS_GET_CLASS
 CamelInternetAddressClass
+camel_internet_address_get_type
 <SUBSECTION Private>
 CamelInternetAddressPrivate
-camel_internet_address_get_type
 </SECTION>
 
 <SECTION>
@@ -1177,7 +1175,6 @@ CAMEL_JUNK_FILTER_INTERFACE
 CAMEL_IS_JUNK_FILTER_INTERFACE
 CAMEL_JUNK_FILTER_GET_INTERFACE
 CamelJunkFilterInterface
-<SUBSECTION Private>
 camel_junk_filter_get_type
 </SECTION>
 
@@ -1196,9 +1193,9 @@ CAMEL_LOCAL_SETTINGS_CLASS
 CAMEL_IS_LOCAL_SETTINGS_CLASS
 CAMEL_LOCAL_SETTINGS_GET_CLASS
 CamelLocalSettingsClass
+camel_local_settings_get_type
 <SUBSECTION Private>
 CamelLocalSettingsPrivate
-camel_local_settings_get_type
 </SECTION>
 
 <SECTION>
@@ -1222,9 +1219,9 @@ CAMEL_MEDIUM_CLASS
 CAMEL_IS_MEDIUM_CLASS
 CAMEL_MEDIUM_GET_CLASS
 CamelMediumClass
+camel_medium_get_type
 <SUBSECTION Private>
 CamelMediumPrivate
-camel_medium_get_type
 </SECTION>
 
 <SECTION>
@@ -1241,9 +1238,9 @@ CAMEL_MIME_FILTER_BASIC_CLASS
 CAMEL_IS_MIME_FILTER_BASIC_CLASS
 CAMEL_MIME_FILTER_BASIC_GET_CLASS
 CamelMimeFilterBasicClass
+camel_mime_filter_basic_get_type
 <SUBSECTION Private>
 CamelMimeFilterBasicPrivate
-camel_mime_filter_basic_get_type
 </SECTION>
 
 <SECTION>
@@ -1264,9 +1261,9 @@ CAMEL_MIME_FILTER_BESTENC_CLASS
 CAMEL_IS_MIME_FILTER_BESTENC_CLASS
 CAMEL_MIME_FILTER_BESTENC_GET_CLASS
 CamelMimeFilterBestencClass
+camel_mime_filter_bestenc_get_type
 <SUBSECTION Private>
 CamelMimeFilterBestencPrivate
-camel_mime_filter_bestenc_get_type
 </SECTION>
 
 <SECTION>
@@ -1282,9 +1279,9 @@ CAMEL_MIME_FILTER_CANON_CLASS
 CAMEL_IS_MIME_FILTER_CANON_CLASS
 CAMEL_MIME_FILTER_CANON_GET_CLASS
 CamelMimeFilterCanonClass
+camel_mime_filter_canon_get_type
 <SUBSECTION Private>
 CamelMimeFilterCanonPrivate
-camel_mime_filter_canon_get_type
 </SECTION>
 
 <SECTION>
@@ -1300,9 +1297,9 @@ CAMEL_MIME_FILTER_CHARSET_CLASS
 CAMEL_IS_MIME_FILTER_CHARSET_CLASS
 CAMEL_MIME_FILTER_CHARSET_GET_CLASS
 CamelMimeFilterCharsetClass
+camel_mime_filter_charset_get_type
 <SUBSECTION Private>
 CamelMimeFilterCharsetPrivate
-camel_mime_filter_charset_get_type
 </SECTION>
 
 <SECTION>
@@ -1320,9 +1317,9 @@ CAMEL_MIME_FILTER_CRLF_CLASS
 CAMEL_IS_MIME_FILTER_CRLF_CLASS
 CAMEL_MIME_FILTER_CRLF_GET_CLASS
 CamelMimeFilterCRLFClass
+camel_mime_filter_crlf_get_type
 <SUBSECTION Private>
 CamelMimeFilterCRLFPrivate
-camel_mime_filter_crlf_get_type
 </SECTION>
 
 <SECTION>
@@ -1340,9 +1337,9 @@ CAMEL_MIME_FILTER_ENRICHED_CLASS
 CAMEL_IS_MIME_FILTER_ENRICHED_CLASS
 CAMEL_MIME_FILTER_ENRICHED_GET_CLASS
 CamelMimeFilterEnrichedClass
+camel_mime_filter_enriched_get_type
 <SUBSECTION Private>
 CamelMimeFilterEnrichedPrivate
-camel_mime_filter_enriched_get_type
 </SECTION>
 
 <SECTION>
@@ -1358,9 +1355,9 @@ CAMEL_MIME_FILTER_FROM_CLASS
 CAMEL_IS_MIME_FILTER_FROM_CLASS
 CAMEL_MIME_FILTER_FROM_GET_CLASS
 CamelMimeFilterFromClass
+camel_mime_filter_from_get_type
 <SUBSECTION Private>
 CamelMimeFilterFromPrivate
-camel_mime_filter_from_get_type
 </SECTION>
 
 <SECTION>
@@ -1377,9 +1374,9 @@ CAMEL_MIME_FILTER_GZIP_CLASS
 CAMEL_IS_MIME_FILTER_GZIP_CLASS
 CAMEL_MIME_FILTER_GZIP_GET_CLASS
 CamelMimeFilterGZipClass
+camel_mime_filter_gzip_get_type
 <SUBSECTION Private>
 CamelMimeFilterGZipPrivate
-camel_mime_filter_gzip_get_type
 </SECTION>
 
 <SECTION>
@@ -1395,9 +1392,9 @@ CAMEL_MIME_FILTER_HTML_CLASS
 CAMEL_IS_MIME_FILTER_HTML_CLASS
 CAMEL_MIME_FILTER_HTML_GET_CLASS
 CamelMimeFilterHTMLClass
+camel_mime_filter_html_get_type
 <SUBSECTION Private>
 CamelMimeFilterHTMLPrivate
-camel_mime_filter_html_get_type
 </SECTION>
 
 <SECTION>
@@ -1415,9 +1412,9 @@ CAMEL_MIME_FILTER_INDEX_CLASS
 CAMEL_IS_MIME_FILTER_INDEX_CLASS
 CAMEL_MIME_FILTER_INDEX_GET_CLASS
 CamelMimeFilterIndexClass
+camel_mime_filter_index_get_type
 <SUBSECTION Private>
 CamelMimeFilterIndexPrivate
-camel_mime_filter_index_get_type
 </SECTION>
 
 <SECTION>
@@ -1433,9 +1430,9 @@ CAMEL_MIME_FILTER_LINEWRAP_CLASS
 CAMEL_IS_MIME_FILTER_LINEWRAP_CLASS
 CAMEL_MIME_FILTER_LINEWRAP_GET_CLASS
 CamelMimeFilterLinewrapClass
+camel_mime_filter_linewrap_get_type
 <SUBSECTION Private>
 CamelMimeFilterLinewrapPrivate
-camel_mime_filter_linewrap_get_type
 </SECTION>
 
 <SECTION>
@@ -1451,9 +1448,9 @@ CAMEL_MIME_FILTER_PGP_CLASS
 CAMEL_IS_MIME_FILTER_PGP_CLASS
 CAMEL_MIME_FILTER_PGP_GET_CLASS
 CamelMimeFilterPgpClass
+camel_mime_filter_pgp_get_type
 <SUBSECTION Private>
 CamelMimeFilterPgpPrivate
-camel_mime_filter_pgp_get_type
 </SECTION>
 
 <SECTION>
@@ -1469,9 +1466,9 @@ CAMEL_MIME_FILTER_SAVE_CLASS
 CAMEL_IS_MIME_FILTER_SAVE_CLASS
 CAMEL_MIME_FILTER_SAVE_GET_CLASS
 CamelMimeFilterSaveClass
+camel_mime_filter_save_get_type
 <SUBSECTION Private>
 CamelMimeFilterSavePrivate
-camel_mime_filter_save_get_type
 </SECTION>
 
 <SECTION>
@@ -1498,9 +1495,9 @@ CAMEL_MIME_FILTER_TOHTML_CLASS
 CAMEL_IS_MIME_FILTER_TOHTML_CLASS
 CAMEL_MIME_FILTER_TOHTML_GET_CLASS
 CamelMimeFilterToHTMLClass
+camel_mime_filter_tohtml_get_type
 <SUBSECTION Private>
 CamelMimeFilterToHTMLPrivate
-camel_mime_filter_tohtml_get_type
 </SECTION>
 
 <SECTION>
@@ -1518,9 +1515,9 @@ CAMEL_MIME_FILTER_WINDOWS_CLASS
 CAMEL_IS_MIME_FILTER_WINDOWS_CLASS
 CAMEL_MIME_FILTER_WINDOWS_GET_CLASS
 CamelMimeFilterWindowsClass
+camel_mime_filter_windows_get_type
 <SUBSECTION Private>
 CamelMimeFilterWindowsPrivate
-camel_mime_filter_windows_get_type
 </SECTION>
 
 <SECTION>
@@ -1554,9 +1551,9 @@ CAMEL_MIME_FILTER_YENC_CLASS
 CAMEL_IS_MIME_FILTER_YENC_CLASS
 CAMEL_MIME_FILTER_YENC_GET_CLASS
 CamelMimeFilterYencClass
+camel_mime_filter_yenc_get_type
 <SUBSECTION Private>
 CamelMimeFilterYencPrivate
-camel_mime_filter_yenc_get_type
 </SECTION>
 
 <SECTION>
@@ -1577,9 +1574,9 @@ CAMEL_MIME_FILTER_CLASS
 CAMEL_IS_MIME_FILTER_CLASS
 CAMEL_MIME_FILTER_GET_CLASS
 CamelMimeFilterClass
+camel_mime_filter_get_type
 <SUBSECTION Private>
 CamelMimeFilterPrivate
-camel_mime_filter_get_type
 </SECTION>
 
 <SECTION>
@@ -1595,9 +1592,9 @@ CAMEL_MIME_FILTER_PROGRESS_CLASS
 CAMEL_IS_MIME_FILTER_PROGRESS_CLASS
 CAMEL_MIME_FILTER_PROGRESS_GET_CLASS
 CamelMimeFilterProgressClass
+camel_mime_filter_progress_get_type
 <SUBSECTION Private>
 CamelMimeFilterProgressPrivate
-camel_mime_filter_progress_get_type
 </SECTION>
 
 <SECTION>
@@ -1643,7 +1640,6 @@ CAMEL_MIME_MESSAGE_CLASS
 CAMEL_IS_MIME_MESSAGE_CLASS
 CAMEL_MIME_MESSAGE_GET_CLASS
 CamelMimeMessageClass
-<SUBSECTION Private>
 camel_mime_message_get_type
 </SECTION>
 
@@ -1688,9 +1684,9 @@ CAMEL_MIME_PARSER_CLASS
 CAMEL_IS_MIME_PARSER_CLASS
 CAMEL_MIME_PARSER_GET_CLASS
 CamelMimeParserClass
+camel_mime_parser_get_type
 <SUBSECTION Private>
 CamelMimeParserPrivate
-camel_mime_parser_get_type
 </SECTION>
 
 <SECTION>
@@ -1730,9 +1726,9 @@ CAMEL_MIME_PART_CLASS
 CAMEL_IS_MIME_PART_CLASS
 CAMEL_MIME_PART_GET_CLASS
 CamelMimePartClass
+camel_mime_part_get_type
 <SUBSECTION Private>
 CamelMimePartPrivate
-camel_mime_part_get_type
 </SECTION>
 
 <SECTION>
@@ -1764,7 +1760,6 @@ CAMEL_MULTIPART_ENCRYPTED_CLASS
 CAMEL_IS_MULTIPART_ENCRYPTED_CLASS
 CAMEL_MULTIPART_ENCRYPTED_GET_CLASS
 CamelMultipartEncryptedClass
-<SUBSECTION Private>
 camel_multipart_encrypted_get_type
 </SECTION>
 
@@ -1782,7 +1777,6 @@ CAMEL_MULTIPART_SIGNED_CLASS
 CAMEL_IS_MULTIPART_SIGNED_CLASS
 CAMEL_MULTIPART_SIGNED_GET_CLASS
 CamelMultipartSignedClass
-<SUBSECTION Private>
 camel_multipart_signed_get_type
 </SECTION>
 
@@ -1810,7 +1804,6 @@ CAMEL_MULTIPART_CLASS
 CAMEL_IS_MULTIPART_CLASS
 CAMEL_MULTIPART_GET_CLASS
 CamelMultipartClass
-<SUBSECTION Private>
 camel_multipart_get_type
 </SECTION>
 
@@ -1876,9 +1869,9 @@ CAMEL_NNTP_ADDRESS_CLASS
 CAMEL_IS_NNTP_ADDRESS_CLASS
 CAMEL_NNTP_ADDRESS_GET_CLASS
 CamelNNTPAddressClass
+camel_nntp_address_get_type
 <SUBSECTION Private>
 CamelNNTPAddressPrivate
-camel_nntp_address_get_type
 </SECTION>
 
 <SECTION>
@@ -1912,9 +1905,9 @@ CAMEL_OBJECT_CLASS
 CAMEL_IS_OBJECT_CLASS
 CAMEL_OBJECT_GET_CLASS
 CamelObjectClass
+camel_object_get_type
 <SUBSECTION Private>
 CamelObjectPrivate
-camel_object_get_type
 camel_error_quark
 </SECTION>
 
@@ -1935,9 +1928,9 @@ CAMEL_OFFLINE_FOLDER_CLASS
 CAMEL_IS_OFFLINE_FOLDER_CLASS
 CAMEL_OFFLINE_FOLDER_GET_CLASS
 CamelOfflineFolderClass
+camel_offline_folder_get_type
 <SUBSECTION Private>
 CamelOfflineFolderPrivate
-camel_offline_folder_get_type
 </SECTION>
 
 <SECTION>
@@ -1957,7 +1950,6 @@ CAMEL_OFFLINE_JOURNAL_CLASS
 CAMEL_IS_OFFLINE_JOURNAL_CLASS
 CAMEL_OFFLINE_JOURNAL_GET_CLASS
 CamelOfflineJournalClass
-<SUBSECTION Private>
 camel_offline_journal_get_type
 </SECTION>
 
@@ -1975,9 +1967,9 @@ CAMEL_OFFLINE_SETTINGS_CLASS
 CAMEL_IS_OFFLINE_SETTINGS_CLASS
 CAMEL_OFFLINE_SETTINGS_GET_CLASS
 CamelOfflineSettingsClass
+camel_offline_settings_get_type
 <SUBSECTION Private>
 CamelOfflineSettingsPrivate
-camel_offline_settings_get_type
 </SECTION>
 
 <SECTION>
@@ -1995,9 +1987,9 @@ CAMEL_OFFLINE_STORE_CLASS
 CAMEL_IS_OFFLINE_STORE_CLASS
 CAMEL_OFFLINE_STORE_GET_CLASS
 CamelOfflineStoreClass
+camel_offline_store_get_type
 <SUBSECTION Private>
 CamelOfflineStorePrivate
-camel_offline_store_get_type
 </SECTION>
 
 <SECTION>
@@ -2042,11 +2034,11 @@ CAMEL_IS_KEY_TABLE_CLASS
 CAMEL_KEY_TABLE_GET_CLASS
 CamelPartitionTableClass
 CamelKeyTableClass
+camel_partition_table_get_type
+camel_key_table_get_type
 <SUBSECTION Private>
 CamelPartitionTablePrivate
 CamelKeyTablePrivate
-camel_partition_table_get_type
-camel_key_table_get_type
 </SECTION>
 
 <SECTION>
@@ -2121,7 +2113,6 @@ CAMEL_SASL_ANONYMOUS_CLASS
 CAMEL_IS_SASL_ANONYMOUS_CLASS
 CAMEL_SASL_ANONYMOUS_GET_CLASS
 CamelSaslAnonymousClass
-<SUBSECTION Private>
 camel_sasl_anonymous_get_type
 </SECTION>
 
@@ -2137,9 +2128,9 @@ CAMEL_SASL_CRAM_MD5_CLASS
 CAMEL_IS_SASL_CRAM_MD5_CLASS
 CAMEL_SASL_CRAM_MD5_GET_CLASS
 CamelSaslCramMd5Class
+camel_sasl_cram_md5_get_type
 <SUBSECTION Private>
 CamelSaslCramMd5Private
-camel_sasl_cram_md5_get_type
 </SECTION>
 
 <SECTION>
@@ -2154,9 +2145,9 @@ CAMEL_SASL_DIGEST_MD5_CLASS
 CAMEL_IS_SASL_DIGEST_MD5_CLASS
 CAMEL_SASL_DIGEST_MD5_GET_CLASS
 CamelSaslDigestMd5Class
+camel_sasl_digest_md5_get_type
 <SUBSECTION Private>
 CamelSaslDigestMd5Private
-camel_sasl_digest_md5_get_type
 </SECTION>
 
 <SECTION>
@@ -2171,9 +2162,9 @@ CAMEL_SASL_GSSAPI_CLASS
 CAMEL_IS_SASL_GSSAPI_CLASS
 CAMEL_SASL_GSSAPI_GET_CLASS
 CamelSaslGssapiClass
+camel_sasl_gssapi_get_type
 <SUBSECTION Private>
 CamelSaslGssapiPrivate
-camel_sasl_gssapi_get_type
 </SECTION>
 
 <SECTION>
@@ -2188,9 +2179,9 @@ CAMEL_SASL_LOGIN_CLASS
 CAMEL_IS_SASL_LOGIN_CLASS
 CAMEL_SASL_LOGIN_GET_CLASS
 CamelSaslLoginClass
+camel_sasl_login_get_type
 <SUBSECTION Private>
 CamelSaslLoginPrivate
-camel_sasl_login_get_type
 </SECTION>
 
 <SECTION>
@@ -2205,9 +2196,9 @@ CAMEL_SASL_NTLM_CLASS
 CAMEL_IS_SASL_NTLM_CLASS
 CAMEL_SASL_NTLM_GET_CLASS
 CamelSaslNTLMClass
+camel_sasl_ntlm_get_type
 <SUBSECTION Private>
 CamelSaslNTLMPrivate
-camel_sasl_ntlm_get_type
 </SECTION>
 
 <SECTION>
@@ -2222,9 +2213,9 @@ CAMEL_SASL_PLAIN_CLASS
 CAMEL_IS_SASL_PLAIN_CLASS
 CAMEL_SASL_PLAIN_GET_CLASS
 CamelSaslPlainClass
+camel_sasl_plain_get_type
 <SUBSECTION Private>
 CamelSaslPlainPrivate
-camel_sasl_plain_get_type
 </SECTION>
 
 <SECTION>
@@ -2239,9 +2230,9 @@ CAMEL_SASL_POPB4SMTP_CLASS
 CAMEL_IS_SASL_POPB4SMTP_CLASS
 CAMEL_SASL_POPB4SMTP_GET_CLASS
 CamelSaslPOPB4SMTPClass
+camel_sasl_popb4smtp_get_type
 <SUBSECTION Private>
 CamelSaslPOPB4SMTPPrivate
-camel_sasl_popb4smtp_get_type
 </SECTION>
 
 <SECTION>
@@ -2273,9 +2264,9 @@ CAMEL_SASL_CLASS
 CAMEL_IS_SASL_CLASS
 CAMEL_SASL_GET_CLASS
 CamelSaslClass
+camel_sasl_get_type
 <SUBSECTION Private>
 CamelSaslPrivate
-camel_sasl_get_type
 </SECTION>
 
 <SECTION>
@@ -2327,9 +2318,9 @@ CAMEL_SERVICE_CLASS
 CAMEL_IS_SERVICE_CLASS
 CAMEL_SERVICE_GET_CLASS
 CamelServiceClass
+camel_service_get_type
 <SUBSECTION Private>
 CamelServicePrivate
-camel_service_get_type
 camel_service_error_quark
 </SECTION>
 
@@ -2351,6 +2342,7 @@ camel_session_remove_services
 camel_session_get_password
 camel_session_forget_password
 camel_session_alert_user
+camel_session_trust_prompt
 camel_session_build_password_prompt
 camel_session_get_online
 camel_session_set_online
@@ -2381,9 +2373,9 @@ CAMEL_SESSION_CLASS
 CAMEL_IS_SESSION_CLASS
 CAMEL_SESSION_GET_CLASS
 CamelSessionClass
+camel_session_get_type
 <SUBSECTION Private>
 CamelSessionPrivate
-camel_session_get_type
 </SECTION>
 
 <SECTION>
@@ -2401,9 +2393,9 @@ CAMEL_SETTINGS_CLASS
 CAMEL_IS_SETTINGS_CLASS
 CAMEL_SETTINGS_GET_CLASS
 CamelSettingsClass
+camel_settings_get_type
 <SUBSECTION Private>
 CamelSettingsPrivate
-camel_settings_get_type
 </SECTION>
 
 <SECTION>
@@ -2445,7 +2437,6 @@ CAMEL_SEXP_CLASS
 CAMEL_IS_SEXP_CLASS
 CAMEL_SEXP_GET_CLASS
 CamelSExpClass
-<SUBSECTION Private>
 camel_sexp_get_type
 </SECTION>
 
@@ -2467,9 +2458,9 @@ CAMEL_SMIME_CONTEXT_CLASS
 CAMEL_IS_SMIME_CONTEXT_CLASS
 CAMEL_SMIME_CONTEXT_GET_CLASS
 CamelSMIMEContextClass
+camel_smime_context_get_type
 <SUBSECTION Private>
 CamelSMIMEContextPrivate
-camel_smime_context_get_type
 </SECTION>
 
 <SECTION>
@@ -2540,9 +2531,9 @@ CAMEL_STORE_CLASS
 CAMEL_IS_STORE_CLASS
 CAMEL_STORE_GET_CLASS
 CamelStoreClass
+camel_store_get_type
 <SUBSECTION Private>
 CamelStorePrivate
-camel_store_get_type
 camel_store_error_quark
 </SECTION>
 
@@ -2560,9 +2551,9 @@ CAMEL_STORE_SETTINGS_CLASS
 CAMEL_IS_STORE_SETTINGS_CLASS
 CAMEL_STORE_SETTINGS_GET_CLASS
 CamelStoreSettingsClass
+camel_store_settings_get_type
 <SUBSECTION Private>
 CamelStoreSettingsPrivate
-camel_store_settings_get_type
 </SECTION>
 
 <SECTION>
@@ -2611,9 +2602,9 @@ CAMEL_STORE_SUMMARY_CLASS
 CAMEL_IS_STORE_SUMMARY_CLASS
 CAMEL_STORE_SUMMARY_GET_CLASS
 CamelStoreSummaryClass
+camel_store_summary_get_type
 <SUBSECTION Private>
 CamelStoreSummaryPrivate
-camel_store_summary_get_type
 </SECTION>
 
 <SECTION>
@@ -2635,7 +2626,6 @@ CAMEL_STREAM_CLASS
 CAMEL_IS_STREAM_CLASS
 CAMEL_STREAM_GET_CLASS
 CamelStreamClass
-<SUBSECTION Private>
 camel_stream_get_type
 </SECTION>
 
@@ -2656,9 +2646,9 @@ CAMEL_STREAM_BUFFER_CLASS
 CAMEL_IS_STREAM_BUFFER_CLASS
 CAMEL_STREAM_BUFFER_GET_CLASS
 CamelStreamBufferClass
+camel_stream_buffer_get_type
 <SUBSECTION Private>
 CamelStreamBufferPrivate
-camel_stream_buffer_get_type
 </SECTION>
 
 <SECTION>
@@ -2677,9 +2667,9 @@ CAMEL_STREAM_FILTER_CLASS
 CAMEL_IS_STREAM_FILTER_CLASS
 CAMEL_STREAM_FILTER_GET_CLASS
 CamelStreamFilterClass
+camel_stream_filter_get_type
 <SUBSECTION Private>
 CamelStreamFilterPrivate
-camel_stream_filter_get_type
 </SECTION>
 
 <SECTION>
@@ -2697,9 +2687,9 @@ CAMEL_STREAM_FS_CLASS
 CAMEL_IS_STREAM_FS_CLASS
 CAMEL_STREAM_FS_GET_CLASS
 CamelStreamFsClass
+camel_stream_fs_get_type
 <SUBSECTION Private>
 CamelStreamFsPrivate
-camel_stream_fs_get_type
 </SECTION>
 
 <SECTION>
@@ -2721,9 +2711,9 @@ CAMEL_STREAM_MEM_CLASS
 CAMEL_IS_STREAM_MEM_CLASS
 CAMEL_STREAM_MEM_GET_CLASS
 CamelStreamMemClass
+camel_stream_mem_get_type
 <SUBSECTION Private>
 CamelStreamMemPrivate
-camel_stream_mem_get_type
 </SECTION>
 
 <SECTION>
@@ -2739,7 +2729,6 @@ CAMEL_STREAM_NULL_CLASS
 CAMEL_IS_STREAM_NULL_CLASS
 CAMEL_STREAM_NULL_GET_CLASS
 CamelStreamNullClass
-<SUBSECTION Private>
 camel_stream_null_get_type
 </SECTION>
 
@@ -2757,7 +2746,6 @@ CAMEL_STREAM_PROCESS_CLASS
 CAMEL_IS_STREAM_PROCESS_CLASS
 CAMEL_STREAM_PROCESS_GET_CLASS
 CamelStreamProcessClass
-<SUBSECTION Private>
 camel_stream_process_get_type
 </SECTION>
 
@@ -2777,7 +2765,6 @@ CAMEL_STREAM_VFS_CLASS
 CAMEL_IS_STREAM_VFS_CLASS
 CAMEL_STREAM_VFS_GET_CLASS
 CamelStreamVFSClass
-<SUBSECTION Private>
 camel_stream_vfs_get_type
 </SECTION>
 
@@ -2802,7 +2789,6 @@ CAMEL_SUBSCRIBABLE_INTERFACE
 CAMEL_IS_SUBSCRIBABLE_INTERFACE
 CAMEL_SUBSCRIBABLE_GET_INTERFACE
 CamelSubscribableInterface
-<SUBSECTION Private>
 camel_subscribable_get_type
 </SECTION>
 
@@ -2821,11 +2807,11 @@ CAMEL_TCP_STREAM_RAW_CLASS
 CAMEL_IS_TCP_STREAM_RAW_CLASS
 CAMEL_TCP_STREAM_RAW_GET_CLASS
 CamelTcpStreamRawClass
+camel_tcp_stream_raw_get_type
 <SUBSECTION Private>
 addrinfo
 sockaddr
 socklen_t
-camel_tcp_stream_raw_get_type
 camel_proxy_error_quark
 </SECTION>
 
@@ -2845,9 +2831,9 @@ CAMEL_TCP_STREAM_SSL_CLASS
 CAMEL_IS_TCP_STREAM_SSL_CLASS
 CAMEL_TCP_STREAM_SSL_GET_CLASS
 CamelTcpStreamSSLClass
+camel_tcp_stream_ssl_get_type
 <SUBSECTION Private>
 CamelTcpStreamSSLPrivate
-camel_tcp_stream_ssl_get_type
 </SECTION>
 
 <SECTION>
@@ -2873,9 +2859,9 @@ CAMEL_TCP_STREAM_CLASS
 CAMEL_IS_TCP_STREAM_CLASS
 CAMEL_TCP_STREAM_GET_CLASS
 CamelTcpStreamClass
+camel_tcp_stream_get_type
 <SUBSECTION Private>
 CamelTcpStreamPrivate
-camel_tcp_stream_get_type
 </SECTION>
 
 <SECTION>
@@ -2925,15 +2911,15 @@ CamelTextIndexClass
 CamelTextIndexCursorClass
 CamelTextIndexKeyCursorClass
 CamelTextIndexNameClass
+camel_text_index_get_type
+camel_text_index_cursor_get_type
+camel_text_index_key_cursor_get_type
+camel_text_index_name_get_type
 <SUBSECTION Private>
 CamelTextIndexPrivate
 CamelTextIndexCursorPrivate
 CamelTextIndexKeyCursorPrivate
 CamelTextIndexNamePrivate
-camel_text_index_get_type
-camel_text_index_cursor_get_type
-camel_text_index_key_cursor_get_type
-camel_text_index_name_get_type
 </SECTION>
 
 <SECTION>
@@ -2954,9 +2940,9 @@ CAMEL_TRANSPORT_CLASS
 CAMEL_IS_TRANSPORT_CLASS
 CAMEL_TRANSPORT_GET_CLASS
 CamelTransportClass
+camel_transport_get_type
 <SUBSECTION Private>
 CamelTransportPrivate
-camel_transport_get_type
 </SECTION>
 
 <SECTION>
@@ -2989,9 +2975,9 @@ CAMEL_VEE_DATA_CACHE_CLASS
 CAMEL_IS_VEE_DATA_CACHE_CLASS
 CAMEL_VEE_DATA_CACHE_GET_CLASS
 CamelVeeDataCacheClass
+camel_vee_data_cache_get_type
 <SUBSECTION Private>
 CamelVeeDataCachePrivate
-camel_vee_data_cache_get_type
 </SECTION>
 
 <SECTION>
@@ -3025,9 +3011,9 @@ CAMEL_VEE_FOLDER_CLASS
 CAMEL_IS_VEE_FOLDER_CLASS
 CAMEL_VEE_FOLDER_GET_CLASS
 CamelVeeFolderClass
+camel_vee_folder_get_type
 <SUBSECTION Private>
 CamelVeeFolderPrivate
-camel_vee_folder_get_type
 </SECTION>
 
 <SECTION>
@@ -3045,9 +3031,9 @@ CAMEL_TYPE_VEE_MESSAGE_INFO_DATA
 CAMEL_VEE_MESSAGE_INFO_DATA_CLASS
 CAMEL_IS_VEE_MESSAGE_INFO_DATA_CLASS
 CAMEL_VEE_MESSAGE_INFO_DATA_GET_CLASS
+camel_vee_message_info_data_get_type
 <SUBSECTION Private>
 CamelVeeMessageInfoDataPrivate
-camel_vee_message_info_data_get_type
 </SECTION>
 
 <SECTION>
@@ -3072,9 +3058,9 @@ CAMEL_VEE_STORE_CLASS
 CAMEL_IS_VEE_STORE_CLASS
 CAMEL_VEE_STORE_GET_CLASS
 CamelVeeStoreClass
+camel_vee_store_get_type
 <SUBSECTION Private>
 CamelVeeStorePrivate
-camel_vee_store_get_type
 </SECTION>
 
 <SECTION>
@@ -3092,9 +3078,9 @@ CAMEL_VEE_SUBFOLDER_DATA_CLASS
 CAMEL_IS_VEE_SUBFOLDER_DATA_CLASS
 CAMEL_VEE_SUBFOLDER_DATA_GET_CLASS
 CamelVeeSubfolderDataClass
+camel_vee_subfolder_data_get_type
 <SUBSECTION Private>
 CamelVeeSubfolderDataPrivate
-camel_vee_subfolder_data_get_type
 </SECTION>
 
 <SECTION>
@@ -3115,9 +3101,9 @@ CAMEL_VEE_SUMMARY_CLASS
 CAMEL_IS_VEE_SUMMARY_CLASS
 CAMEL_VEE_SUMMARY_GET_CLASS
 CamelVeeSummaryClass
+camel_vee_summary_get_type
 <SUBSECTION Private>
 CamelVeeSummaryPrivate
-camel_vee_summary_get_type
 </SECTION>
 
 <SECTION>
@@ -3136,7 +3122,6 @@ CAMEL_VTRASH_FOLDER_CLASS
 CAMEL_IS_VTRASH_FOLDER_CLASS
 CAMEL_VTRASH_FOLDER_GET_CLASS
 CamelVTrashFolderClass
-<SUBSECTION Private>
 camel_vtrash_folder_get_type
 </SECTION>
 
diff --git a/docs/reference/libebackend/Makefile.am b/docs/reference/libebackend/Makefile.am
index 77d3cce..cc81c2a 100644
--- a/docs/reference/libebackend/Makefile.am
+++ b/docs/reference/libebackend/Makefile.am
@@ -2,7 +2,7 @@
 DOC_MODULE = libebackend
 
 # The top-level SGML file.
-DOC_MAIN_SGML_FILE = libebackend-docs.xml
+DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
 
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS = --deprecated-guards="EDS_DISABLE_DEPRECATED"
diff --git a/docs/reference/libebackend/libebackend-sections.txt b/docs/reference/libebackend/libebackend-sections.txt
index 5d1a3fa..177b541 100644
--- a/docs/reference/libebackend/libebackend-sections.txt
+++ b/docs/reference/libebackend/libebackend-sections.txt
@@ -17,9 +17,9 @@ E_TYPE_AUTHENTICATION_MEDIATOR
 E_AUTHENTICATION_MEDIATOR_CLASS
 E_IS_AUTHENTICATION_MEDIATOR_CLASS
 E_AUTHENTICATION_MEDIATOR_GET_CLASS
+e_authentication_mediator_get_type
 <SUBSECTION Private>
 EAuthenticationMediatorPrivate
-e_authentication_mediator_get_type
 </SECTION>
 
 <SECTION>
@@ -62,11 +62,11 @@ E_IS_AUTHENTICATION_SESSION_CLASS
 E_AUTHENTICATION_SESSION_GET_CLASS
 E_TYPE_AUTHENTICATION_SESSION_RESULT
 EAuthenticationSessionClass
+e_authentication_session_get_type
+e_authentication_session_result_get_type
 <SUBSECTION Private>
 EAuthenticationSessionPrivate
 e_authentication_session_error_quark
-e_authentication_session_get_type
-e_authentication_session_result_get_type
 </SECTION>
 
 <SECTION>
@@ -87,9 +87,9 @@ E_BACKEND_CLASS
 E_IS_BACKEND_CLASS
 E_BACKEND_GET_CLASS
 EBackendClass
+e_backend_get_type
 <SUBSECTION Private>
 EBackendPrivate
-e_backend_get_type
 </SECTION>
 
 <SECTION>
@@ -106,9 +106,9 @@ E_BACKEND_FACTORY_CLASS
 E_IS_BACKEND_FACTORY_CLASS
 E_BACKEND_FACTORY_GET_CLASS
 EBackendFactoryClass
+e_backend_factory_get_type
 <SUBSECTION Private>
 EBackendFactoryPrivate
-e_backend_factory_get_type
 </SECTION>
 
 <SECTION>
@@ -137,9 +137,9 @@ E_COLLECTION_BACKEND_CLASS
 E_IS_COLLECTION_BACKEND_CLASS
 E_COLLECTION_BACKEND_GET_CLASS
 ECollectionBackendClass
+e_collection_backend_get_type
 <SUBSECTION Private>
 ECollectionBackendPrivate
-e_collection_backend_get_type
 </SECTION>
 
 <SECTION>
@@ -155,9 +155,9 @@ E_COLLECTION_BACKEND_FACTORY_CLASS
 E_IS_COLLECTION_BACKEND_FACTORY_CLASS
 E_COLLECTION_BACKEND_FACTORY_GET_CLASS
 ECollectionBackendFactoryClass
+e_collection_backend_factory_get_type
 <SUBSECTION Private>
 ECollectionBackendFactoryPrivate
-e_collection_backend_factory_get_type
 </SECTION>
 
 <SECTION>
@@ -173,9 +173,9 @@ E_TYPE_DATA_FACTORY
 E_DATA_FACTORY_CLASS
 E_IS_DATA_FACTORY_CLASS
 E_DATA_FACTORY_GET_CLASS
+e_data_factory_get_type
 <SUBSECTION Private>
 EDataFactoryPrivate
-e_data_factory_get_type
 </SECTION>
 
 <SECTION>
@@ -197,10 +197,10 @@ E_IS_DBUS_SERVER_CLASS
 E_DBUS_SERVER_GET_CLASS
 E_TYPE_DBUS_SERVER_EXIT_CODE
 EDBusServerClass
-<SUBSECTION Private>
-EDBusServerPrivate
 e_dbus_server_get_type
 e_dbus_server_exit_code_get_type
+<SUBSECTION Private>
+EDBusServerPrivate
 </SECTION>
 
 <SECTION>
@@ -223,11 +223,11 @@ e_file_cache_get_filename
 E_FILE_CACHE
 E_IS_FILE_CACHE
 E_TYPE_FILE_CACHE
-e_file_cache_get_type
 E_FILE_CACHE_CLASS
 E_IS_FILE_CACHE_CLASS
 E_FILE_CACHE_GET_CLASS
 EFileCacheClass
+e_file_cache_get_type
 <SUBSECTION Private>
 EFileCachePrivate
 </SECTION>
@@ -268,7 +268,6 @@ E_EXTENSIBLE_INTERFACE
 E_IS_EXTENSIBLE_INTERFACE
 E_EXTENSIBLE_GET_INTERFACE
 EExtensibleInterface
-<SUBSECTION Private>
 e_extensible_get_type
 </SECTION>
 
@@ -284,9 +283,9 @@ E_TYPE_EXTENSION
 E_EXTENSION_CLASS
 E_IS_EXTENSION_CLASS
 E_EXTENSION_GET_CLASS
+e_extension_get_type
 <SUBSECTION Private>
 EExtensionPrivate
-e_extension_get_type
 </SECTION>
 
 <SECTION>
@@ -306,9 +305,9 @@ E_MODULE_CLASS
 E_IS_MODULE_CLASS
 E_MODULE_GET_CLASS
 EModuleClass
+e_module_get_type
 <SUBSECTION Private>
 EModulePrivate
-e_module_get_type
 </SECTION>
 
 <SECTION>
@@ -326,9 +325,9 @@ E_OFFLINE_LISTENER_CLASS
 E_IS_OFFLINE_LISTENER_CLASS
 E_OFFLINE_LISTENER_GET_CLASS
 EOfflineListenerClass
+e_offline_listener_get_type
 <SUBSECTION Private>
 EOfflineListenerPrivate
-e_offline_listener_get_type
 </SECTION>
 
 <SECTION>
@@ -361,9 +360,9 @@ E_SERVER_SIDE_SOURCE_CLASS
 E_IS_SERVER_SIDE_SOURCE_CLASS
 E_SERVER_SIDE_SOURCE_GET_CLASS
 EServerSideSourceClass
+e_server_side_source_get_type
 <SUBSECTION Private>
 EServerSideSourcePrivate
-e_server_side_source_get_type
 </SECTION>
 
 <SECTION>
@@ -396,10 +395,10 @@ E_SOURCE_REGISTRY_SERVER_GET_CLASS
 E_TYPE_SOURCE_PERMISSION_FLAGS
 E_TYPE_PASSWORD_REMEMBER_TYPE
 ESourceRegistryServerClass
-<SUBSECTION Private>
-ESourceRegistryServerPrivate
 e_source_registry_server_get_type
 e_source_permission_flags_get_type
+<SUBSECTION Private>
+ESourceRegistryServerPrivate
 </SECTION>
 
 <SECTION>
@@ -426,9 +425,9 @@ E_USER_PROMPTER_CLASS
 E_IS_USER_PROMPTER_CLASS
 E_USER_PROMPTER_GET_CLASS
 EUserPrompterClass
+e_user_prompter_get_type
 <SUBECTION Private>
 EUserPrompterPrivate
-e_user_prompter_get_type
 </SECTION>
 
 <SECTION>
@@ -447,9 +446,9 @@ E_USER_PROMPTER_SERVER_CLASS
 E_IS_USER_PROMPTER_SERVER_CLASS
 E_USER_PROMPTER_SERVER_GET_CLASS
 EUserPrompterServerClass
+e_user_prompter_server_get_type
 <SUBSECTION Private>
 EUserPrompterServerPrivate
-e_user_prompter_server_get_type
 </SECTION>
 
 <SECTION>
@@ -466,8 +465,8 @@ E_USER_PROMPTER_SERVER_EXTENSION_CLASS
 E_IS_USER_PROMPTER_SERVER_EXTENSION_CLASS
 E_USER_PROMPTER_SERVER_EXTENSION_GET_CLASS
 EUserPrompterServerExtensionClass
+e_user_prompter_server_extension_get_type
 <SUBSECTION Private>
 EUserPrompterServerExtensionPrivate
-e_user_prompter_server_extension_get_type
 </SECTION>
 
diff --git a/docs/reference/libedataserver/Makefile.am b/docs/reference/libedataserver/Makefile.am
index 7a48782..05884d6 100644
--- a/docs/reference/libedataserver/Makefile.am
+++ b/docs/reference/libedataserver/Makefile.am
@@ -2,7 +2,7 @@
 DOC_MODULE = libedataserver
 
 # The top-level SGML file.
-DOC_MAIN_SGML_FILE = libedataserver-docs.sgml
+DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
 
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS = --deprecated-guards="EDS_DISABLE_DEPRECATED"
diff --git a/docs/reference/libedataserver/libedataserver-sections.txt b/docs/reference/libedataserver/libedataserver-sections.txt
index 526778d..7fa0bcf 100644
--- a/docs/reference/libedataserver/libedataserver-sections.txt
+++ b/docs/reference/libedataserver/libedataserver-sections.txt
@@ -18,6 +18,24 @@ e_debug_log_clear
 </SECTION>
 
 <SECTION>
+<FILE>e-cancellable-locks</FILE>
+<TITLE>Cancellable Locks</TITLE>
+ECancellableMutex
+e_cancellable_mutex_init
+e_cancellable_mutex_clear
+e_cancellable_mutex_lock
+e_cancellable_mutex_unlock
+e_cancellable_mutex_get_internal_mutex
+ECancellableRecMutex
+e_cancellable_rec_mutex_init
+e_cancellable_rec_mutex_clear
+e_cancellable_rec_mutex_lock
+e_cancellable_rec_mutex_unlock
+<SECTION Private>
+ECancellableLocksBase
+</SECTION>
+
+<SECTION>
 <FILE>e-client</FILE>
 <TITLE>EClient</TITLE>
 E_CLIENT_ERROR
@@ -155,7 +173,6 @@ E_ITERATOR_CLASS
 E_IS_ITERATOR_CLASS
 E_ITERATOR_GET_CLASS
 EIteratorClass
-<SUBSECTION Private>
 e_iterator_get_type
 </SECTION>
 
@@ -183,7 +200,6 @@ E_LIST_CLASS
 E_IS_LIST_CLASS
 E_LIST_GET_CLASS
 EListClass
-<SUBSECTION Private>
 e_list_get_type
 </SECTION>
 
@@ -200,7 +216,6 @@ E_LIST_ITERATOR_CLASS
 E_IS_LIST_ITERATOR_CLASS
 E_LIST_ITERATOR_GET_CLASS
 EListIteratorClass
-<SUBSECTION Private>
 e_list_iterator_get_type
 </SECTION>
 
@@ -231,9 +246,9 @@ E_IS_PROXY
 E_IS_PROXY_CLASS
 E_PROXY_GET_CLASS
 EProxyClass
+e_proxy_get_type
 <SUBSECTION Private>
 EProxyPrivate
-e_proxy_get_type
 </SECTION>
 
 <SECTION>
@@ -286,9 +301,9 @@ E_SOURCE_CLASS
 E_IS_SOURCE_CLASS
 E_SOURCE_GET_CLASS
 ESourceClass
+e_source_get_type
 <SUBSECTION Private>
 ESourcePrivate
-e_source_get_type
 </SECTION>
 
 <SECTION>
@@ -304,9 +319,9 @@ E_SOURCE_ADDRESS_BOOK_CLASS
 E_IS_SOURCE_ADDRESS_BOOK_CLASS
 E_SOURCE_ADDRESS_BOOK_GET_CLASS
 ESourceAddressBookClass
+e_source_address_book_get_type
 <SUBSECTION Private>
 ESourceAddressBookPrivate
-e_source_address_book_get_type
 </SECTION>
 
 <SECTION>
@@ -327,9 +342,9 @@ E_SOURCE_ALARMS_CLASS
 E_IS_SOURCE_ALARMS_CLASS
 E_SOURCE_ALARMS_GET_CLASS
 ESourceAlarmsClass
+e_source_alarms_get_type
 <SUBSECTION Private>
 ESourceAlarmsPrivate
-e_source_alarms_get_type
 </SECTION>
 
 <SECTION>
@@ -357,9 +372,9 @@ E_SOURCE_AUTHENTICATION_CLASS
 E_IS_SOURCE_AUTHENTICATION_CLASS
 E_SOURCE_AUTHENTICATION_GET_CLASS
 ESourceAuthenticationClass
+e_source_authentication_get_type
 <SUBSECTION Private>
 ESourceAuthenticationPrivate
-e_source_authentication_get_type
 </SECTION>
 
 <SECTION>
@@ -377,7 +392,6 @@ E_SOURCE_AUTHENTICATOR
 E_IS_SOURCE_AUTHENTICATOR
 E_TYPE_SOURCE_AUTHENTICATOR
 E_SOURCE_AUTHENTICATOR_GET_INTERFACE
-<SUBSECTION Private>
 e_source_authenticator_get_type
 </SECTION>
 
@@ -396,9 +410,9 @@ E_SOURCE_AUTOCOMPLETE_CLASS
 E_IS_SOURCE_AUTOCOMPLETE_CLASS
 E_SOURCE_AUTOCOMPLETE_GET_CLASS
 ESourceAutocompleteClass
+e_source_autocomplete_get_type
 <SUBSECTION Private>
 ESourceAutocompletePrivate
-e_source_autocomplete_get_type
 </SECTION>
 
 <SECTION>
@@ -416,9 +430,9 @@ E_SOURCE_BACKEND_CLASS
 E_IS_SOURCE_BACKEND_CLASS
 E_SOURCE_BACKEND_GET_CLASS
 ESourceBackendClass
+e_source_backend_get_type
 <SUBSECTION Private>
 ESourceBackendPrivate
-e_source_backend_get_type
 </SECTION>
 
 <SECTION>
@@ -434,9 +448,9 @@ E_SOURCE_CALENDAR_CLASS
 E_IS_SOURCE_CALENDAR_CLASS
 E_SOURCE_CALENDAR_GET_CLASS
 ESourceCalendarClass
+e_source_calendar_get_type
 <SUBSECTION Private>
 ESourceCalendarPrivate
-e_source_calendar_get_type
 </SECTION>
 
 <SECTION>
@@ -457,9 +471,9 @@ E_SOURCE_CAMEL_CLASS
 E_IS_SOURCE_CAMEL_CLASS
 E_SOURCE_CAMEL_GET_CLASS
 ESourceCamelClass
+e_source_camel_get_type
 <SUBSECTION Private>
 ESourceCamelPrivate
-e_source_camel_get_type
 </SECTION>
 
 <SECTION>
@@ -484,9 +498,9 @@ E_SOURCE_COLLECTION_CLASS
 E_IS_SOURCE_COLLECTION_CLASS
 E_SOURCE_COLLECTION_GET_CLASS
 ESourceCollectionClass
+e_source_collection_get_type
 <SUBSECTION Private>
 ESourceCollectionPrivate
-e_source_collection_get_type
 </SECTION>
 
 <SECTION>
@@ -504,9 +518,9 @@ E_SOURCE_EXTENSION_CLASS
 E_IS_SOURCE_EXTENSION_CLASS
 E_SOURCE_EXTENSION_GET_CLASS
 ESourceExtensionClass
+e_source_extension_get_type
 <SUBSECTION Private>
 ESourceExtensionPrivate
-e_source_extension_get_type
 </SECTION>
 
 <SECTION>
@@ -525,9 +539,9 @@ E_SOURCE_GOA_CLASS
 E_IS_SOURCE_GOA_CLASS
 E_SOURCE_GOA_GET_CLASS
 ESourceGoaClass
+e_source_goa_get_type
 <SUBSECTION Private>
 ESourceGoaPrivate
-e_source_goa_get_type
 </SECTION>
 
 <SECTION>
@@ -546,9 +560,9 @@ E_SOURCE_MAIL_ACCOUNT_CLASS
 E_IS_SOURCE_MAIL_ACCOUNT_CLASS
 E_SOURCE_MAIL_ACCOUNT_GET_CLASS
 ESourceMailAccountClass
+e_source_mail_account_get_type
 <SUBSECTION Private>
 ESourceMailAccountPrivate
-e_source_mail_account_get_type
 </SECTION>
 
 <SECTION>
@@ -578,9 +592,9 @@ E_SOURCE_MAIL_COMPOSITION_CLASS
 E_IS_SOURCE_MAIL_COMPOSITION_CLASS
 E_SOURCE_MAIL_COMPOSITION_GET_CLASS
 ESourceMailCompositionClass
+e_source_mail_composition_get_type
 <SUBSECTION Private>
 ESourceMailCompositionPrivate
-e_source_mail_composition_get_type
 </SECTION>
 
 <SECTION>
@@ -611,9 +625,9 @@ E_SOURCE_MAIL_IDENTITY_CLASS
 E_IS_SOURCE_MAIL_IDENTITY_CLASS
 E_SOURCE_MAIL_IDENTITY_GET_CLASS
 ESourceMailIdentityClass
+e_source_mail_identity_get_type
 <SUBSECTION Private>
 ESourceMailIdentityPrivate
-e_source_mail_identity_get_type
 </SECTION>
 
 <SECTION>
@@ -642,9 +656,9 @@ E_SOURCE_MAIL_SIGNATURE_CLASS
 E_IS_SOURCE_MAIL_SIGNATURE_CLASS
 E_SOURCE_MAIL_SIGNATURE_GET_CLASS
 ESourceMailSignatureClass
+e_source_mail_signature_get_type
 <SUBSECTION Private>
 ESourceMailSignaturePrivate
-e_source_mail_signature_get_type
 </SECTION>
 
 <SECTION>
@@ -668,9 +682,9 @@ E_SOURCE_MAIL_SUBMISSION_CLASS
 E_IS_SOURCE_MAIL_SUBMISSION_CLASS
 E_SOURCE_MAIL_SUBMISSION_GET_CLASS
 ESourceMailSubmissionClass
+e_source_mail_submission_get_type
 <SUBSECTION Private>
 ESourceMailSubmissionPrivate
-e_source_mail_submission_get_type
 </SECTION>
 
 <SECTION>
@@ -686,9 +700,9 @@ E_SOURCE_MAIL_TRANSPORT_CLASS
 E_IS_SOURCE_MAIL_TRANSPORT_CLASS
 E_SOURCE_MAIL_TRANSPORT_GET_CLASS
 ESourceMailSubmissionClass
+e_source_mail_transport_get_type
 <SUBSECTION Private>
 ESourceMailTransportPrivate
-e_source_mail_transport_get_type
 </SECTION>
 
 <SECTION>
@@ -707,9 +721,9 @@ E_SOURCE_MDN_CLASS
 E_IS_SOURCE_MDN_CLASS
 E_SOURCE_MDN_GET_CLASS
 ESourceMDNClass
+e_source_mdn_get_type
 <SUBSECTION Private>
 ESourceMDNPrivate
-e_source_mdn_get_type
 </SECTION>
 
 <SECTION>
@@ -725,9 +739,9 @@ E_SOURCE_MEMO_LIST_CLASS
 E_IS_SOURCE_MEMO_LIST_CLASS
 E_SOURCE_MEMO_LIST_GET_CLASS
 ESourceMemoListClass
+e_source_memo_list_get_type
 <SUBSECTION Private>
 ESourceMemoListPrivate
-e_source_memo_list_get_type
 </SECTION>
 
 <SECTION>
@@ -745,9 +759,9 @@ E_SOURCE_OFFLINE_CLASS
 E_IS_SOURCE_OFFLINE_CLASS
 E_SOURCE_OFFLINE_GET_CLASS
 ESourceOfflineClass
+e_source_offline_get_type
 <SUBSECTION Private>
 ESourceOfflinePrivate
-e_source_offline_get_type
 </SECTION>
 
 <SECTION>
@@ -775,9 +789,9 @@ E_SOURCE_OPENPGP_CLASS
 E_IS_SOURCE_OPENPGP_CLASS
 E_SOURCE_OPENPGP_GET_CLASS
 ESourceOpenPGPClass
+e_source_openpgp_get_type
 <SUBSECTION Private>
 ESourceOpenPGPPrivate
-e_source_openpgp_get_type
 </SECTION>
 
 <SECTION>
@@ -802,9 +816,9 @@ E_SOURCE_REFRESH_CLASS
 E_IS_SOURCE_REFRESH_CLASS
 E_SOURCE_REFRESH_GET_CLASS
 ESourceRefreshClass
+e_source_refresh_get_type
 <SUBSECTION Private>
 ESourceRefreshPrivate
-e_source_refresh_get_type
 </SECTION>
 
 <SECTION>
@@ -857,9 +871,9 @@ E_SOURCE_REGISTRY_CLASS
 E_IS_SOURCE_REGISTRY_CLASS
 E_SOURCE_REGISTRY_GET_CLASS
 ESourceRegistryClass
+e_source_registry_get_type
 <SUBSECTION Private>
 ESourceRegistryPrivate
-e_source_registry_get_type
 </SECTION>
 
 <SECTION>
@@ -878,9 +892,9 @@ E_SOURCE_RESOURCE_CLASS
 E_IS_SOURCE_RESOURCE_CLASS
 E_SOURCE_RESOURCE_GET_CLASS
 ESourceResourceClass
+e_source_resource_get_type
 <SUBSECTION Private>
 ESourceResourcePrivate
-e_source_resource_get_type
 </SECTION>
 
 <SECTION>
@@ -901,9 +915,9 @@ E_SOURCE_SECURITY_CLASS
 E_IS_SOURCE_SECURITY_CLASS
 E_SOURCE_SECURITY_GET_CLASS
 ESourceSecurityClass
+e_source_security_get_type
 <SUBSECTION Private>
 ESourceSecurityPrivate
-e_source_security_get_type
 </SECTION>
 
 <SECTION>
@@ -923,9 +937,9 @@ E_SOURCE_SELECTABLE_CLASS
 E_IS_SOURCE_SELECTABLE_CLASS
 E_SOURCE_SELECTABLE_GET_CLASS
 ESourceSelectableClass
+e_source_selectable_get_type
 <SUBSECTION Private>
 ESourceSelectablePrivate
-e_source_selectable_get_type
 </SECTION>
 
 <SECTION>
@@ -956,9 +970,9 @@ E_SOURCE_SMIME_CLASS
 E_IS_SOURCE_SMIME_CLASS
 E_SOURCE_SMIME_GET_CLASS
 ESourceSMIMEClass
+e_source_smime_get_type
 <SUBSECTION Private>
 ESourceSMIMEPrivate
-e_source_smime_get_type
 </SECTION>
 
 <SECTION>
@@ -974,9 +988,9 @@ E_SOURCE_TASK_LIST_CLASS
 E_IS_SOURCE_TASK_LIST_CLASS
 E_SOURCE_TASK_LIST_GET_CLASS
 ESourceTaskListClass
+e_source_task_list_get_type
 <SUBSECTION Private>
 ESourceTaskListPrivate
-e_source_task_list_get_type
 </SECTION>
 
 <SECTION>
@@ -1012,9 +1026,9 @@ E_SOURCE_WEBDAV_CLASS
 E_IS_SOURCE_WEBDAV_CLASS
 E_SOURCE_WEBDAV_GET_CLASS
 ESourceWebdavClass
+e_source_webdav_get_type
 <SUBSECTION Private>
 ESourceWebdavPrivate
-e_source_webdav_get_type
 </SECTION>
 
 <SECTION>
@@ -1081,7 +1095,6 @@ IS_E_SEXP
 IS_E_SEXP_CLASS
 E_SEXP_GET_CLASS
 ESExpClass
-<SUBSECTION Private>
 e_sexp_get_type
 </SECTION>
 
@@ -1173,7 +1186,10 @@ e_named_parameters_clear
 e_named_parameters_assign
 e_named_parameters_set
 e_named_parameters_get
+e_named_parameters_to_strv
 e_named_parameters_test
+<SUBSECTION Standard>
+e_named_parameters_get_type
 </SECTION>
 
 <SECTION>
diff --git a/docs/reference/private/Makefile.am b/docs/reference/private/Makefile.am
index 747f073..2803a64 100644
--- a/docs/reference/private/Makefile.am
+++ b/docs/reference/private/Makefile.am
@@ -2,7 +2,7 @@
 DOC_MODULE = libedbus-private
 
 # The top-level SGML file.
-DOC_MAIN_SGML_FILE = libedbus-private-docs.sgml
+DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
 
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS = --deprecated-guards="EDS_DISABLE_DEPRECATED"
diff --git a/libedataserver/e-data-server-util.h b/libedataserver/e-data-server-util.h
index 4e5c338..ea14898 100644
--- a/libedataserver/e-data-server-util.h
+++ b/libedataserver/e-data-server-util.h
@@ -159,7 +159,7 @@ void		e_named_parameters_set		(ENamedParameters *parameters,
 						 const gchar *value);
 const gchar *	e_named_parameters_get		(const ENamedParameters *parameters,
 						 const gchar *name);
-gchar **        e_named_parameters_to_strv	(const ENamedParameters *parameters);
+gchar **	e_named_parameters_to_strv	(const ENamedParameters *parameters);
 gboolean	e_named_parameters_test		(const ENamedParameters *parameters,
 						 const gchar *name,
 						 const gchar *value,



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