More Gtk-Doc updates.

diff --git a/camel/camel-session.c b/camel/camel-session.c
index 40c3c21..037b87b 100644 (file)
--- a/camel/camel-session.c
+++ b/camel/camel-session.c
@@ -1111,7 +1111,10 @@ camel_session_unlock (CamelSession *session,
  * @socks_host: Hostname of the SOCKS proxy, or #NULL for none.
  * @socks_port: Port number of the SOCKS proxy
  *
- * Sets a SOCKS proxy that will be used throughout the @session for TCP connections.
+ * Sets a SOCKS proxy that will be used throughout the @session for
+ * TCP connections.
+ *
+ * Since: 3.0
  */
 void
 camel_session_set_socks_proxy (CamelSession *session, const gchar *socks_host, int socks_port)
@@ -1138,6 +1141,8 @@ camel_session_set_socks_proxy (CamelSession *session, const gchar *socks_host, i
  *
  * Queries the SOCKS proxy that is configured for a @session.  This will
  * put #NULL in @hosts_ret if there is no proxy configured.
+ *
+ * Since: 3.0
  */
 void
 camel_session_get_socks_proxy (CamelSession *session, gchar **host_ret, gint *port_ret)

diff --git a/camel/camel-tcp-stream.c b/camel/camel-tcp-stream.c
index 47f1f5c..1bf39ea 100644 (file)
--- a/camel/camel-tcp-stream.c
+++ b/camel/camel-tcp-stream.c
@@ -211,7 +211,7 @@ camel_tcp_stream_get_remote_address (CamelTcpStream *stream,
  * Configures a SOCKS proxy for the specified @stream.  Instead of direct connections,
  * this @stream will instead go through the proxy.
  *
- * Since: 2.32
+ * Since: 3.0
  */
 void
 camel_tcp_stream_set_socks_proxy (CamelTcpStream *stream, const gchar *socks_host, gint socks_port)
@@ -241,6 +241,8 @@ camel_tcp_stream_set_socks_proxy (CamelTcpStream *stream, const gchar *socks_hos
  *
  * Queries the SOCKS proxy that is configured for a @stream.  This will
  * return #NULL in @socks_host_ret if no proxy is configured.
+ *
+ * Since: 3.0
  */
 void
 camel_tcp_stream_peek_socks_proxy (CamelTcpStream *stream, const gchar **socks_host_ret, gint *socks_port_ret)

diff --git a/docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml b/docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml
index 8ac0b50..45191fe 100644 (file)
--- a/docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml
+++ b/docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml
@@ -33,6 +33,7 @@ e-cal-check-timezones
 @const gchar *tzid, gconstpointer custom, GError **error:
 @const gchar *tzid, gconstpointer custom, GError **error:
 @const gchar *tzid, gconstpointer custom, GError **error:
+@const gchar *tzid, gconstpointer custom, GError **error:
 @const gchar *tzid, gconstpointer custom, GError **error: 
 @custom: 
 @error: 

diff --git a/docs/reference/camel/camel-sections.txt b/docs/reference/camel/camel-sections.txt
index 8283873..7e4f314 100644 (file)
--- a/docs/reference/camel/camel-sections.txt
+++ b/docs/reference/camel/camel-sections.txt
@@ -550,8 +550,6 @@ camel_folder_summary_set_build_content
 camel_folder_summary_next_uid
 camel_folder_summary_next_uid_string
 camel_folder_summary_set_uid
-camel_folder_summary_load
-camel_folder_summary_save
 camel_folder_summary_save_to_db
 camel_folder_summary_load_from_db
 camel_folder_summary_header_load
@@ -1911,6 +1909,8 @@ CamelSessionAlertType
 CamelSessionThreadOps
 CamelSessionThreadMsg
 camel_session_construct
+camel_session_set_socks_proxy
+camel_session_get_socks_proxy
 camel_session_get_service
 camel_session_get_service_connected
 camel_session_get_store
@@ -2336,6 +2336,8 @@ CamelSockOptData
 camel_tcp_stream_connect
 camel_tcp_stream_getsockopt
 camel_tcp_stream_setsockopt
+camel_tcp_stream_set_socks_proxy
+camel_tcp_stream_peek_socks_proxy
 camel_tcp_stream_get_local_address
 camel_tcp_stream_get_remote_address
 <SUBSECTION Standard>
@@ -2347,6 +2349,7 @@ CAMEL_IS_TCP_STREAM_CLASS
 CAMEL_TCP_STREAM_GET_CLASS
 CamelTcpStreamClass
 <SUBSECTION Private>
+CamelTcpStreamPrivate
 camel_tcp_stream_get_type
 </SECTION>
 

diff --git a/docs/reference/camel/tmpl/camel-cipher-context.sgml b/docs/reference/camel/tmpl/camel-cipher-context.sgml
index 0833e69..cbf9918 100644 (file)
--- a/docs/reference/camel/tmpl/camel-cipher-context.sgml
+++ b/docs/reference/camel/tmpl/camel-cipher-context.sgml
@@ -382,6 +382,12 @@ CamelCipherContext
 @gpointer cert_data: 
 @gpointer cert_data:
 @gpointer cert_data: 
+@gpointer cert_data:
+@gpointer cert_data: 
+@gpointer cert_data:
+@gpointer cert_data: 
+@gpointer cert_data:
+@gpointer cert_data: 
 @gpointer cert_data: 
 
 

diff --git a/docs/reference/camel/tmpl/camel-session.sgml b/docs/reference/camel/tmpl/camel-session.sgml
index 316c936..047d249 100644 (file)
--- a/docs/reference/camel/tmpl/camel-session.sgml
+++ b/docs/reference/camel/tmpl/camel-session.sgml
@@ -89,6 +89,26 @@ CamelSession
 @storage_path: 
 
 
+<!-- ##### FUNCTION camel_session_set_socks_proxy ##### -->
+<para>
+
+</para>
+
+@session: 
+@socks_host: 
+@socks_port: 
+
+
+<!-- ##### FUNCTION camel_session_get_socks_proxy ##### -->
+<para>
+
+</para>
+
+@session: 
+@host_ret: 
+@port_ret: 
+
+
 <!-- ##### FUNCTION camel_session_get_service ##### -->
 <para>
 

diff --git a/docs/reference/camel/tmpl/camel-tcp-stream.sgml b/docs/reference/camel/tmpl/camel-tcp-stream.sgml
index ef20ba3..71a05b9 100644 (file)
--- a/docs/reference/camel/tmpl/camel-tcp-stream.sgml
+++ b/docs/reference/camel/tmpl/camel-tcp-stream.sgml
@@ -92,6 +92,26 @@ CamelTcpStream
 @Returns: 
 
 
+<!-- ##### FUNCTION camel_tcp_stream_set_socks_proxy ##### -->
+<para>
+
+</para>
+
+@stream: 
+@socks_host: 
+@socks_port: 
+
+
+<!-- ##### FUNCTION camel_tcp_stream_peek_socks_proxy ##### -->
+<para>
+
+</para>
+
+@stream: 
+@socks_host_ret: 
+@socks_port_ret: 
+
+
 <!-- ##### FUNCTION camel_tcp_stream_get_local_address ##### -->
 <para>
 

diff --git a/docs/reference/libedataserverui/Makefile.am b/docs/reference/libedataserverui/Makefile.am
index fa4895f..82c1d8a 100644 (file)
--- a/docs/reference/libedataserverui/Makefile.am
+++ b/docs/reference/libedataserverui/Makefile.am
@@ -15,7 +15,8 @@ HFILE_GLOB = $(top_srcdir)/libedataserverui/*.h
 CFILE_GLOB = $(top_srcdir)/libedataserverui/*.c
 
 IGNORE_HFILES =                        \
-       e-data-server-ui-marshal.h
+       e-data-server-ui-marshal.h      \
+       gtk-compat.h
 
 GTKDOC_CFLAGS  =                                       \
        -I$(top_srcdir)/libedataserverui                \