Misc gtk-doc updates

diff --git a/.gitignore b/.gitignore
index f597375..387566d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,7 @@ docs/reference/libsoup-2.4.hierarchy
 docs/reference/libsoup-2.4.interfaces
 docs/reference/libsoup-2.4.prerequisites
 docs/reference/libsoup-2.4.signals
+docs/reference/libsoup-2.4.types
 docs/reference/tmpl
 docs/reference/xml
 gtk-doc.make

diff --git a/configure.ac b/configure.ac
index 1f8b7e3..4202dae 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -204,7 +204,7 @@ AC_SUBST(SQLITE_LIBS)
 dnl ***************
 dnl *** gtk-doc ***
 dnl ***************
-GTK_DOC_CHECK([1.0])
+GTK_DOC_CHECK([1.10])
 
 
 dnl *************************************

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 441fdbf..64d3cf8 100644 (file)
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -13,7 +13,7 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 DOC_SOURCE_DIR=../../libsoup
 
 # Extra options to supply to gtkdoc-scan.
-SCAN_OPTIONS=--deprecated-guards=LIBSOUP_DISABLE_DEPRECATED
+SCAN_OPTIONS=--deprecated-guards=LIBSOUP_DISABLE_DEPRECATED --rebuild-types
 
 # Extra options to supply to gtkdoc-scangobj.
 SCANGOBJ_OPTIONS=--type-init-func 'g_type_init(); g_thread_init(NULL)'

diff --git a/docs/reference/libsoup-2.4-sections.txt b/docs/reference/libsoup-2.4-sections.txt
index 77f89c9..3980677 100644 (file)
--- a/docs/reference/libsoup-2.4-sections.txt
+++ b/docs/reference/libsoup-2.4-sections.txt
@@ -1,3 +1,4 @@
+<INCLUDE>libsoup/soup.h</INCLUDE>
 <SECTION>
 <FILE>soup-message</FILE>
 <TITLE>SoupMessage</TITLE>
@@ -830,6 +831,7 @@ soup_cookie_jar_text_get_type
 </SECTION>
 
 <SECTION>
+<INCLUDE>libsoup/soup-gnome.h</INCLUDE>
 <FILE>soup-cookie-jar-sqlite</FILE>
 <TITLE>SoupCookieJarSqlite</TITLE>
 SoupCookieJarSqlite
@@ -866,6 +868,7 @@ soup_proxy_uri_resolver_get_type
 </SECTION>
 
 <SECTION>
+<INCLUDE>libsoup/soup-gnome.h</INCLUDE>
 <FILE>soup-gnome-features</FILE>
 SOUP_TYPE_GNOME_FEATURES_2_26
 SOUP_TYPE_PROXY_RESOLVER_GNOME

diff --git a/docs/reference/libsoup-2.4.types b/docs/reference/libsoup-2.4.types
deleted file mode 100644 (file)
index ae7a4b2..0000000
--- a/docs/reference/libsoup-2.4.types
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <libsoup/soup-gnome.h>
-
-soup_address_get_type
-soup_auth_get_type
-soup_auth_domain_get_type
-soup_auth_domain_basic_get_type
-soup_auth_domain_digest_get_type
-soup_cookie_jar_get_type
-soup_cookie_jar_text_get_type
-soup_cookie_jar_sqlite_get_type
-soup_logger_get_type
-soup_message_get_type
-soup_proxy_resolver_get_type
-soup_server_get_type
-soup_session_get_type
-soup_session_sync_get_type
-soup_session_async_get_type
-soup_session_feature_get_type
-soup_socket_get_type
-