[evolution-data-server/gnome-3-6] Further API doc cleanups.



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

    Further API doc cleanups.
    
    (cherry picked from commit 8709051dfc436cef096d239ed2ebfb20265885e5)

 docs/reference/addressbook/libebook/Makefile.am    |    2 +-
 .../addressbook/libebook/libebook-sections.txt     |    6 +-
 .../addressbook/libedata-book/Makefile.am          |    2 +-
 .../libedata-book/libedata-book-sections.txt       |   33 ++--
 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         |   29 ++--
 docs/reference/camel/Makefile.am                   |    3 +-
 docs/reference/camel/camel-sections.txt            |  194 +++++++++-----------
 docs/reference/libebackend/Makefile.am             |    2 +-
 .../reference/libebackend/libebackend-sections.txt |   35 ++--
 docs/reference/libedataserver/Makefile.am          |    2 +-
 .../libedataserver/libedataserver-sections.txt     |   65 +++----
 docs/reference/libedataserverui/Makefile.am        |    2 +-
 .../libedataserverui/libedataserverui-sections.txt |   34 ++--
 docs/reference/private/Makefile.am                 |    2 +-
 17 files changed, 197 insertions(+), 229 deletions(-)
---
diff --git a/docs/reference/addressbook/libebook/Makefile.am b/docs/reference/addressbook/libebook/Makefile.am
index 804e101..60fd6b5 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|E_BOOK_DISABLE_DEPRECATED"
diff --git a/docs/reference/addressbook/libebook/libebook-sections.txt b/docs/reference/addressbook/libebook/libebook-sections.txt
index 40c2b06..61b34d1 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>
@@ -258,13 +258,13 @@ E_TYPE_CONTACT_PHOTO
 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
 EContactPhotoType
 <SUBSECTION Private>
 EContactPrivate
-e_contact_geo_get_type
 </SECTION>
 
 <SECTION>
diff --git a/docs/reference/addressbook/libedata-book/Makefile.am b/docs/reference/addressbook/libedata-book/Makefile.am
index 4be2acc..dff0545 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|E_BOOK_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 c68fc1e..b646790 100644
--- a/docs/reference/addressbook/libedata-book/libedata-book-sections.txt
+++ b/docs/reference/addressbook/libedata-book/libedata-book-sections.txt
@@ -48,7 +48,6 @@ e_book_backend_notify_property_changed
 e_book_backend_sync
 e_book_backend_set_is_removed
 e_book_backend_respond_opened
-EBookBackendClass
 <SUBSECTION Standard>
 E_BOOK_BACKEND
 E_IS_BOOK_BACKEND
@@ -56,9 +55,10 @@ E_TYPE_BOOK_BACKEND
 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>
@@ -132,22 +132,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>
@@ -220,9 +213,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>
@@ -249,9 +242,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>
@@ -295,13 +288,13 @@ 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>
@@ -318,9 +311,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>
@@ -349,9 +342,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 7592d39..d77e9c0 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|E_CAL_DISABLE_DEPRECATED"
diff --git a/docs/reference/calendar/libecal/libecal-sections.txt b/docs/reference/calendar/libecal/libecal-sections.txt
index fa071bd..2d37607 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>
@@ -378,9 +378,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>
@@ -515,9 +515,9 @@ E_CAL_VIEW_CLASS
 E_IS_CAL_VIEW
 E_IS_CAL_VIEW_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 97acb95..6730d8b 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|E_CAL_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 fb149b8..575aafc 100644
--- a/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt
+++ b/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt
@@ -72,9 +72,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>
@@ -108,9 +108,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>
@@ -125,9 +125,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>
@@ -143,9 +143,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>
@@ -184,9 +184,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>
@@ -209,9 +209,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>
@@ -244,9 +244,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>
@@ -305,15 +305,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>
@@ -336,9 +336,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>
@@ -373,10 +373,11 @@ E_DATA_CAL_VIEW
 E_IS_DATA_CAL_VIEW
 E_DATA_CAL_VIEW_TYPE
 E_DATA_CAL_VIEW_CLASS
-IS_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>
@@ -396,10 +397,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 ac64056..d78b4fb 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>
@@ -527,10 +527,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>
 
@@ -555,9 +555,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>
@@ -680,9 +680,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>
@@ -700,9 +700,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>
@@ -725,9 +725,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>
@@ -784,9 +784,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>
@@ -802,9 +802,9 @@ CAMEL_IMAPX_FOLDER_CLASS
 CAMEL_IS_IMAPX_FOLDER_CLASS
 CAMEL_IMAPX_FOLDER_GET_CLASS
 CamelIMAPXFolderClass
-<SUBSECTION Private>
-CamelIMAPXFolder
 camel_imapx_folder_get_type
+<SUBSECTION Private>
+CamelIMAPXFolderPrivate
 imapx_get_filename
 </SECTION>
 
@@ -864,12 +864,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>
 
@@ -919,9 +919,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>
@@ -938,9 +938,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>
@@ -970,7 +970,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>
 
@@ -1004,9 +1003,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>
@@ -1027,7 +1026,6 @@ CAMEL_IMAPX_SUMMARY_CLASS
 CAMEL_IS_IMAPX_SUMMARY_CLASS
 CAMEL_IMAPX_SUMMARY_GET_CLASS
 CamelIMAPXSummaryClass
-<SUBSECTION Private>
 camel_imapx_summary_get_type
 </SECTION>
 
@@ -1084,13 +1082,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>
@@ -1112,9 +1110,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>
@@ -1134,7 +1132,6 @@ CAMEL_JUNK_FILTER_INTERFACE
 CAMEL_IS_JUNK_FILTER_INTERFACE
 CAMEL_JUNK_FILTER_GET_INTERFACE
 CamelJunkFilterInterface
-<SUBSECTION Private>
 camel_junk_filter_get_type
 </SECTION>
 
@@ -1153,9 +1150,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>
@@ -1179,9 +1176,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>
@@ -1198,9 +1195,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>
@@ -1221,9 +1218,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>
@@ -1239,9 +1236,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>
@@ -1257,9 +1254,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>
@@ -1277,9 +1274,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>
@@ -1297,9 +1294,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>
@@ -1315,9 +1312,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>
@@ -1334,9 +1331,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>
@@ -1352,9 +1349,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>
@@ -1372,9 +1369,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>
@@ -1390,9 +1387,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>
@@ -1408,9 +1405,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>
@@ -1426,9 +1423,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>
@@ -1455,9 +1452,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>
@@ -1475,9 +1472,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>
@@ -1511,9 +1508,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>
@@ -1534,9 +1531,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>
@@ -1552,9 +1549,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>
@@ -1600,7 +1597,6 @@ CAMEL_MIME_MESSAGE_CLASS
 CAMEL_IS_MIME_MESSAGE_CLASS
 CAMEL_MIME_MESSAGE_GET_CLASS
 CamelMimeMessageClass
-<SUBSECTION Private>
 camel_mime_message_get_type
 </SECTION>
 
@@ -1645,9 +1641,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>
@@ -1687,9 +1683,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>
@@ -1721,7 +1717,6 @@ CAMEL_MULTIPART_ENCRYPTED_CLASS
 CAMEL_IS_MULTIPART_ENCRYPTED_CLASS
 CAMEL_MULTIPART_ENCRYPTED_GET_CLASS
 CamelMultipartEncryptedClass
-<SUBSECTION Private>
 camel_multipart_encrypted_get_type
 </SECTION>
 
@@ -1739,7 +1734,6 @@ CAMEL_MULTIPART_SIGNED_CLASS
 CAMEL_IS_MULTIPART_SIGNED_CLASS
 CAMEL_MULTIPART_SIGNED_GET_CLASS
 CamelMultipartSignedClass
-<SUBSECTION Private>
 camel_multipart_signed_get_type
 </SECTION>
 
@@ -1767,7 +1761,6 @@ CAMEL_MULTIPART_CLASS
 CAMEL_IS_MULTIPART_CLASS
 CAMEL_MULTIPART_GET_CLASS
 CamelMultipartClass
-<SUBSECTION Private>
 camel_multipart_get_type
 </SECTION>
 
@@ -1833,9 +1826,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>
@@ -1869,9 +1862,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>
 
@@ -1892,9 +1885,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>
@@ -1914,7 +1907,6 @@ CAMEL_OFFLINE_JOURNAL_CLASS
 CAMEL_IS_OFFLINE_JOURNAL_CLASS
 CAMEL_OFFLINE_JOURNAL_GET_CLASS
 CamelOfflineJournalClass
-<SUBSECTION Private>
 camel_offline_journal_get_type
 </SECTION>
 
@@ -1932,9 +1924,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>
@@ -1952,9 +1944,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>
@@ -1999,11 +1991,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>
@@ -2078,7 +2070,6 @@ CAMEL_SASL_ANONYMOUS_CLASS
 CAMEL_IS_SASL_ANONYMOUS_CLASS
 CAMEL_SASL_ANONYMOUS_GET_CLASS
 CamelSaslAnonymousClass
-<SUBSECTION Private>
 camel_sasl_anonymous_get_type
 </SECTION>
 
@@ -2094,9 +2085,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>
@@ -2111,9 +2102,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>
@@ -2128,9 +2119,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>
@@ -2145,9 +2136,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>
@@ -2162,9 +2153,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>
@@ -2179,9 +2170,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>
@@ -2196,9 +2187,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>
@@ -2230,9 +2221,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>
@@ -2284,9 +2275,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>
 
@@ -2338,9 +2329,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>
@@ -2358,9 +2349,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>
@@ -2402,7 +2393,6 @@ CAMEL_SEXP_CLASS
 CAMEL_IS_SEXP_CLASS
 CAMEL_SEXP_GET_CLASS
 CamelSExpClass
-<SUBSECTION Private>
 camel_sexp_get_type
 </SECTION>
 
@@ -2424,9 +2414,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>
@@ -2497,9 +2487,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>
 
@@ -2517,9 +2507,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>
@@ -2568,9 +2558,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>
@@ -2592,7 +2582,6 @@ CAMEL_STREAM_CLASS
 CAMEL_IS_STREAM_CLASS
 CAMEL_STREAM_GET_CLASS
 CamelStreamClass
-<SUBSECTION Private>
 camel_stream_get_type
 </SECTION>
 
@@ -2613,9 +2602,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>
@@ -2634,9 +2623,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>
@@ -2654,9 +2643,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>
@@ -2678,9 +2667,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>
@@ -2696,7 +2685,6 @@ CAMEL_STREAM_NULL_CLASS
 CAMEL_IS_STREAM_NULL_CLASS
 CAMEL_STREAM_NULL_GET_CLASS
 CamelStreamNullClass
-<SUBSECTION Private>
 camel_stream_null_get_type
 </SECTION>
 
@@ -2714,7 +2702,6 @@ CAMEL_STREAM_PROCESS_CLASS
 CAMEL_IS_STREAM_PROCESS_CLASS
 CAMEL_STREAM_PROCESS_GET_CLASS
 CamelStreamProcessClass
-<SUBSECTION Private>
 camel_stream_process_get_type
 </SECTION>
 
@@ -2734,7 +2721,6 @@ CAMEL_STREAM_VFS_CLASS
 CAMEL_IS_STREAM_VFS_CLASS
 CAMEL_STREAM_VFS_GET_CLASS
 CamelStreamVFSClass
-<SUBSECTION Private>
 camel_stream_vfs_get_type
 </SECTION>
 
@@ -2759,7 +2745,6 @@ CAMEL_SUBSCRIBABLE_INTERFACE
 CAMEL_IS_SUBSCRIBABLE_INTERFACE
 CAMEL_SUBSCRIBABLE_GET_INTERFACE
 CamelSubscribableInterface
-<SUBSECTION Private>
 camel_subscribable_get_type
 </SECTION>
 
@@ -2778,11 +2763,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>
 
@@ -2802,9 +2787,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>
@@ -2830,9 +2815,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>
@@ -2882,15 +2867,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>
@@ -2911,9 +2896,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>
@@ -2946,9 +2931,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>
@@ -2982,9 +2967,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>
@@ -3002,9 +2987,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>
@@ -3029,9 +3014,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>
@@ -3049,9 +3034,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>
@@ -3072,9 +3057,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>
@@ -3093,7 +3078,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 8337e13..008a8dc 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>
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 a963209..17f45d4 100644
--- a/docs/reference/libedataserver/libedataserver-sections.txt
+++ b/docs/reference/libedataserver/libedataserver-sections.txt
@@ -154,7 +154,6 @@ E_ITERATOR_CLASS
 E_IS_ITERATOR_CLASS
 E_ITERATOR_GET_CLASS
 EIteratorClass
-<SUBSECTION Private>
 e_iterator_get_type
 </SECTION>
 
@@ -182,7 +181,6 @@ E_LIST_CLASS
 E_IS_LIST_CLASS
 E_LIST_GET_CLASS
 EListClass
-<SUBSECTION Private>
 e_list_get_type
 </SECTION>
 
@@ -199,7 +197,6 @@ E_LIST_ITERATOR_CLASS
 E_IS_LIST_ITERATOR_CLASS
 E_LIST_ITERATOR_GET_CLASS
 EListIteratorClass
-<SUBSECTION Private>
 e_list_iterator_get_type
 </SECTION>
 
@@ -230,9 +227,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>
@@ -285,9 +282,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>
@@ -303,9 +300,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>
@@ -326,9 +323,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>
@@ -356,9 +353,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>
@@ -376,7 +373,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>
 
@@ -395,9 +391,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>
@@ -415,9 +411,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>
@@ -433,9 +429,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>
@@ -456,9 +452,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>
@@ -483,9 +479,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>
@@ -502,9 +498,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>
@@ -523,9 +519,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>
@@ -544,9 +540,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>
@@ -576,9 +572,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>
@@ -609,9 +605,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>
@@ -640,9 +636,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>
@@ -664,9 +660,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>
@@ -682,9 +678,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>
@@ -703,9 +699,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>
@@ -721,9 +717,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>
@@ -741,9 +737,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>
@@ -771,9 +767,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>
@@ -798,9 +794,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>
@@ -852,9 +848,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>
@@ -873,9 +869,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>
@@ -896,9 +892,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>
@@ -918,9 +914,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>
@@ -951,9 +947,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>
@@ -969,9 +965,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>
@@ -1007,9 +1003,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>
@@ -1076,7 +1072,6 @@ IS_E_SEXP
 IS_E_SEXP_CLASS
 E_SEXP_GET_CLASS
 ESExpClass
-<SUBSECTION Private>
 e_sexp_get_type
 </SECTION>
 
diff --git a/docs/reference/libedataserverui/Makefile.am b/docs/reference/libedataserverui/Makefile.am
index 657d0ee..0c62ac8 100644
--- a/docs/reference/libedataserverui/Makefile.am
+++ b/docs/reference/libedataserverui/Makefile.am
@@ -2,7 +2,7 @@
 DOC_MODULE = libedataserverui
 
 # The top-level SGML file.
-DOC_MAIN_SGML_FILE = libedataserverui-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/libedataserverui/libedataserverui-sections.txt b/docs/reference/libedataserverui/libedataserverui-sections.txt
index cf5906a..e9e4354 100644
--- a/docs/reference/libedataserverui/libedataserverui-sections.txt
+++ b/docs/reference/libedataserverui/libedataserverui-sections.txt
@@ -19,9 +19,9 @@ E_CATEGORIES_DIALOG_CLASS
 E_IS_CATEGORIES_DIALOG_CLASS
 E_CATEGORIES_DIALOG_GET_CLASS
 ECategoriesDialogClass
+e_categories_dialog_get_type
 <SUBSECTION Private>
 ECategoriesDialogPrivate
-e_categories_dialog_get_type
 </SECTION>
 
 <SECTION>
@@ -41,9 +41,9 @@ E_CATEGORIES_EDITOR_CLASS
 E_IS_CATEGORIES_EDITOR_CLASS
 E_CATEGORIES_EDITOR_GET_CLASS
 ECategoriesEditorClass
+e_categories_editor_get_type
 <SUBSECTION Private>
 ECategoriesEditorPrivate
-e_categories_editor_get_type
 </SECTION>
 
 <SECTION>
@@ -65,9 +65,9 @@ E_CATEGORIES_SELECTOR_CLASS
 E_IS_CATEGORIES_SELECTOR_CLASS
 E_CATEGORIES_SELECTOR_GET_CLASS
 ECategoriesSelectorClass
+e_categories_selector_get_type
 <SUBSECTION Private>
 ECategoriesSelectorPrivate
-e_categories_selector_get_type
 </SECTION>
 
 <SECTION>
@@ -83,9 +83,9 @@ E_IS_CATEGORY_COMPLETION
 E_IS_CATEGORY_COMPLETION_CLASS
 E_CATEGORY_COMPLETION_GET_CLASS
 ECategoryCompletionClass
+e_category_completion_get_type
 <SUBSECTION Private>
 ECategoryCompletionPrivate
-e_category_completion_get_type
 </SECTION>
 
 <SECTION>
@@ -103,9 +103,9 @@ E_CATEGORY_EDITOR_CLASS
 E_IS_CATEGORY_EDITOR_CLASS
 E_CATEGORY_EDITOR_GET_CLASS
 ECategoryEditorClass
+e_category_editor_get_type
 <SUBSECTION Private>
 ECategoryEditorPrivate
-e_category_editor_get_type
 </SECTION>
 
 <SECTION>
@@ -121,9 +121,9 @@ E_IS_CELL_RENDERER_COLOR
 E_IS_CELL_RENDERER_COLOR_CLASS
 E_CELL_RENDERER_COLOR_GET_CLASS
 ECellRendererColorClass
+e_cell_renderer_color_get_type
 <SUBSECTION Private>
 ECellRendererColorPrivate
-e_cell_renderer_color_get_type
 </SECTION>
 
 <SECTION>
@@ -156,9 +156,9 @@ E_CONTACT_STORE_CLASS
 E_IS_CONTACT_STORE_CLASS
 E_CONTACT_STORE_GET_CLASS
 EContactStoreClass
+e_contact_store_get_type
 <SUBSECTION Private>
 EContactStorePrivate
-e_contact_store_get_type
 </SECTION>
 
 <SECTION>
@@ -184,9 +184,9 @@ E_DESTINATION_STORE_CLASS
 E_IS_DESTINATION_STORE_CLASS
 E_DESTINATION_STORE_GET_CLASS
 EDestinationStoreClass
+e_destination_store_get_type
 <SUBSECTION Private>
 EDestinationStorePrivate
-e_destination_store_get_type
 </SECTION>
 
 <SECTION>
@@ -210,9 +210,9 @@ E_NAME_SELECTOR_CLASS
 E_IS_NAME_SELECTOR_CLASS
 E_NAME_SELECTOR_GET_CLASS
 ENameSelectorClass
+e_name_selector_get_type
 <SUBSECTION Private>
 ENameSelectorPrivate
-e_name_selector_get_type
 </SECTION>
 
 <SECTION>
@@ -233,9 +233,9 @@ E_NAME_SELECTOR_DIALOG_CLASS
 E_IS_NAME_SELECTOR_DIALOG_CLASS
 E_NAME_SELECTOR_DIALOG_GET_CLASS
 ENameSelectorDialogClass
+e_name_selector_dialog_get_type
 <SUBSECTION Private>
 ENameSelectorDialogPrivate
-e_name_selector_dialog_get_type
 </SECTION>
 
 <SECTION>
@@ -265,9 +265,9 @@ E_NAME_SELECTOR_ENTRY_CLASS
 E_IS_NAME_SELECTOR_ENTRY_CLASS
 E_NAME_SELECTOR_ENTRY_GET_CLASS
 ENameSelectorEntryClass
+e_name_selector_entry_get_type
 <SUBSECTION Private>
 ENameSelectorEntryPrivate
-e_name_selector_entry_get_type
 </SECTION>
 
 <SECTION>
@@ -284,9 +284,9 @@ E_NAME_SELECTOR_LIST_CLASS
 E_IS_NAME_SELECTOR_LIST_CLASS
 E_NAME_SELECTOR_LIST_GET_CLASS
 ENameSelectorListClass
+e_name_selector_list_get_type
 <SUBSECTION Private>
 ENameSelectorListPrivate
-e_name_selector_list_get_type
 </SECTION>
 
 <SECTION>
@@ -310,9 +310,9 @@ E_NAME_SELECTOR_MODEL_CLASS
 E_IS_NAME_SELECTOR_MODEL_CLASS
 E_NAME_SELECTOR_MODEL_GET_CLASS
 ENameSelectorModelClass
+e_name_selector_model_get_type
 <SUBSECTION Private>
 ENameSelectorModelPrivate
-e_name_selector_model_get_type
 </SECTION>
 
 <SECTION>
@@ -352,9 +352,9 @@ E_SOURCE_COMBO_BOX_CLASS
 E_IS_SOURCE_COMBO_BOX_CLASS
 E_SOURCE_COMBO_BOX_GET_CLASS
 ESourceComboBoxClass
+e_source_combo_box_get_type
 <SUBSECTION Private>
 ESourceComboBoxPrivate
-e_source_combo_box_get_type
 </SECTION>
 
 <SECTION>
@@ -379,9 +379,9 @@ E_TREE_MODEL_GENERATOR_CLASS
 E_IS_TREE_MODEL_GENERATOR_CLASS
 E_TREE_MODEL_GENERATOR_GET_CLASS
 ETreeModelGeneratorClass
+e_tree_model_generator_get_type
 <SUBSECTION Private>
 ETreeModelGeneratorPrivate
-e_tree_model_generator_get_type
 </SECTION>
 
 <SECTION>
@@ -415,9 +415,9 @@ E_SOURCE_SELECTOR_CLASS
 E_IS_SOURCE_SELECTOR_CLASS
 E_SOURCE_SELECTOR_GET_CLASS
 ESourceSelectorClass
+e_source_selector_get_type
 <SUBSECTION Private>
 ESourceSelectorPrivate
-e_source_selector_get_type
 </SECTION>
 
 <SECTION>
@@ -437,8 +437,8 @@ E_SOURCE_SELECTOR_DIALOG_CLASS
 E_IS_SOURCE_SELECTOR_DIALOG_CLASS
 E_SOURCE_SELECTOR_DIALOG_GET_CLASS
 ESourceSelectorDialogClass
+e_source_selector_dialog_get_type
 <SUBSECTION Private>
 ESourceSelectorDialogPrivate
-e_source_selector_dialog_get_type
 </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"



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