News update for 3.1.3.1 releaseEVOLUTION_DATA_SERVER_3_1_3_1

18 files changed, 56 insertions, 34 deletions

diff --git a/NEWS b/NEWS
index b842ec499..34e5f2e3a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,21 @@
+Evolution-Data-Server 3.1.3.1 2011-07-06
+--------------------------------------
+
+Bug Fixes:
+	Bug#654054 Fix eds build failure (Akhil Laddha)
+
+Miscellaneous Fixes:
+	camel_stream_vprintf() doesn't exist. (Matthew Barnes)
+	Remove camel_stream_reset(). (Matthew Barnes)
+	Prefer g_seekable_seek() over camel_stream_reset(). (Matthew Barnes)
+	Camel: Remove some unnecessary type casts. (Matthew Barnes)
+	CamelImapWrapper: Use GError instead of errno. (Matthew Barnes)
+	camel_stream_process_connect(): Add GError parameter. (Matthew Barnes)
+
+Translations:
+	Wylmer Wang (zh_CN)
+	Daniel Mustieles (es)
+
 Evolution-Data-Server 3.1.3 2011-07-04
 --------------------------------------
 
diff --git a/configure.ac b/configure.ac
index 3612c7126..8e22fa98a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Evolution-Data-Server version
 m4_define([eds_major_version], [3])
 m4_define([eds_minor_version], [1])
-m4_define([eds_micro_version], [4])
+m4_define([eds_micro_version], [3])
 
 m4_define([eds_version],
 	[eds_major_version.eds_minor_version.eds_micro_version])
@@ -19,7 +19,7 @@ m4_define([api_version], [1.2])
 
 dnl Autoconf / Automake Initialization
 AC_PREREQ(2.62)
-AC_INIT([evolution-data-server],[eds_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server])
+AC_INIT([evolution-data-server],[eds_version].1,[http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution-Data-Server])
 AM_INIT_AUTOMAKE([gnu 1.10 tar-ustar -Wall -Wno-portability -Werror foreign])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(README)
diff --git a/docs/reference/addressbook/libebook/tmpl/e-book-query.sgml b/docs/reference/addressbook/libebook/tmpl/e-book-query.sgml
index 92c936889..d850c538d 100644
--- a/docs/reference/addressbook/libebook/tmpl/e-book-query.sgml
+++ b/docs/reference/addressbook/libebook/tmpl/e-book-query.sgml
@@ -88,7 +88,7 @@ Handles queries of addressboook data.
 </para>
 
 @q: 
-@Varargs: 
+@...: 
 @Returns: 
 
 
@@ -109,7 +109,7 @@ Handles queries of addressboook data.
 </para>
 
 @q: 
-@Varargs: 
+@...: 
 @Returns: 
 
 
diff --git a/docs/reference/addressbook/libebook/tmpl/e-vcard.sgml b/docs/reference/addressbook/libebook/tmpl/e-vcard.sgml
index a079f271c..ef2acab53 100644
--- a/docs/reference/addressbook/libebook/tmpl/e-vcard.sgml
+++ b/docs/reference/addressbook/libebook/tmpl/e-vcard.sgml
@@ -163,7 +163,7 @@ Does the low-level parsing work for contact information. This data is more conve
 
 @evcard: 
 @attr: 
-@Varargs: 
+@...: 
 
 
 <!-- ##### FUNCTION e_vcard_add_attribute ##### -->
@@ -192,7 +192,7 @@ Does the low-level parsing work for contact information. This data is more conve
 
 @evcard: 
 @attr: 
-@Varargs: 
+@...: 
 
 
 <!-- ##### FUNCTION e_vcard_attribute_add_value ##### -->
@@ -220,7 +220,7 @@ Does the low-level parsing work for contact information. This data is more conve
 </para>
 
 @attr: 
-@Varargs: 
+@...: 
 
 
 <!-- ##### FUNCTION e_vcard_attribute_remove_values ##### -->
@@ -319,7 +319,7 @@ Does the low-level parsing work for contact information. This data is more conve
 
 @attr: 
 @param: 
-@Varargs: 
+@...: 
 
 
 <!-- ##### FUNCTION e_vcard_attribute_param_add_value ##### -->
@@ -337,7 +337,7 @@ Does the low-level parsing work for contact information. This data is more conve
 </para>
 
 @param: 
-@Varargs: 
+@...: 
 
 
 <!-- ##### FUNCTION e_vcard_attribute_param_remove_values ##### -->
diff --git a/docs/reference/addressbook/libedata-book/tmpl/e-book-backend.sgml b/docs/reference/addressbook/libedata-book/tmpl/e-book-backend.sgml
index ceddad4a4..d285b29e4 100644
--- a/docs/reference/addressbook/libedata-book/tmpl/e-book-backend.sgml
+++ b/docs/reference/addressbook/libedata-book/tmpl/e-book-backend.sgml
@@ -401,7 +401,8 @@ EBookBackend
 @EDataBookView *view, gpointer user_data:
 @EDataBookView *view, gpointer user_data:
 @EDataBookView *view, gpointer user_data:
-@EDataBookView *view, gpointer user_data: 
+@EDataBookView *view, gpointer user_data:
+@callback: 
 @user_data: 
 
 
diff --git a/docs/reference/addressbook/libedata-book/tmpl/e-data-book.sgml b/docs/reference/addressbook/libedata-book/tmpl/e-data-book.sgml
index 90d65f69f..2e1e9983b 100644
--- a/docs/reference/addressbook/libedata-book/tmpl/e-data-book.sgml
+++ b/docs/reference/addressbook/libedata-book/tmpl/e-data-book.sgml
@@ -50,7 +50,7 @@ EDataBook
 
 @status: 
 @custom_msg_fmt: 
-@Varargs: 
+@...: 
 @Returns: 
 
 
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 0adecb86a..c8bb80162 100644
--- a/docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml
+++ b/docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml
@@ -31,7 +31,8 @@ e-cal-check-timezones
 @const gchar *tzid, gconstpointer ecalclient, GCancellable *cancellable, GError **error:
 @const gchar *tzid, gconstpointer ecalclient, GCancellable *cancellable, GError **error:
 @const gchar *tzid, gconstpointer ecalclient, GCancellable *cancellable, GError **error:
-@const gchar *tzid, gconstpointer ecalclient, GCancellable *cancellable, GError **error: 
+@const gchar *tzid, gconstpointer ecalclient, GCancellable *cancellable, GError **error:
+@tzlookup: 
 @ecalclient: 
 @cancellable: 
 @error: 
@@ -131,7 +132,8 @@ 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:
+@tzlookup: 
 @custom: 
 @error: 
 @Returns: 
diff --git a/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend.sgml b/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend.sgml
index b99ef6328..46a55b58e 100644
--- a/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend.sgml
+++ b/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend.sgml
@@ -255,7 +255,8 @@ Base class for calendar/tasks backend implementations.
 @EDataCalView *view, gpointer user_data:
 @EDataCalView *view, gpointer user_data:
 @EDataCalView *view, gpointer user_data:
-@EDataCalView *view, gpointer user_data: 
+@EDataCalView *view, gpointer user_data:
+@callback: 
 @user_data: 
 
 
diff --git a/docs/reference/calendar/libedata-cal/tmpl/e-data-cal.sgml b/docs/reference/calendar/libedata-cal/tmpl/e-data-cal.sgml
index 24aca0a5d..7a3f62946 100644
--- a/docs/reference/calendar/libedata-cal/tmpl/e-data-cal.sgml
+++ b/docs/reference/calendar/libedata-cal/tmpl/e-data-cal.sgml
@@ -50,7 +50,7 @@ Implementation of the calendar CORBA client interface.
 
 @status: 
 @custom_msg_fmt: 
-@Varargs: 
+@...: 
 @Returns: 
 
 
diff --git a/docs/reference/camel/tmpl/camel-cipher-context.sgml b/docs/reference/camel/tmpl/camel-cipher-context.sgml
index 9a4167140..beaf3d149 100644
--- a/docs/reference/camel/tmpl/camel-cipher-context.sgml
+++ b/docs/reference/camel/tmpl/camel-cipher-context.sgml
@@ -764,7 +764,9 @@ CamelCipherContext
 @gpointer cert_data: 
 @gpointer cert_data:
 @gpointer cert_data: 
-@gpointer cert_data: 
+@gpointer cert_data:
+@cert_data_free: 
+@cert_data_clone: 
 
 
 <!-- ##### FUNCTION camel_cipher_validity_envelope ##### -->
diff --git a/docs/reference/camel/tmpl/camel-disco-diary.sgml b/docs/reference/camel/tmpl/camel-disco-diary.sgml
index 2f8be84eb..0a5e14d73 100644
--- a/docs/reference/camel/tmpl/camel-disco-diary.sgml
+++ b/docs/reference/camel/tmpl/camel-disco-diary.sgml
@@ -63,7 +63,7 @@ CamelDiscoDiary
 
 @diary: 
 @action: 
-@Varargs: 
+@...: 
 
 
 <!-- ##### FUNCTION camel_disco_diary_replay ##### -->
diff --git a/docs/reference/camel/tmpl/camel-mime-utils.sgml b/docs/reference/camel/tmpl/camel-mime-utils.sgml
index 288f9a34d..4b49b6c50 100644
--- a/docs/reference/camel/tmpl/camel-mime-utils.sgml
+++ b/docs/reference/camel/tmpl/camel-mime-utils.sgml
@@ -84,15 +84,14 @@ camel-mime-utils
 @next: 
 @id: 
 
-<!-- ##### FUNCTION camel_header_param ##### -->
+<!-- ##### STRUCT camel_header_param ##### -->
 <para>
 
 </para>
 
-@params: 
+@next: 
 @name: 
-@Returns: 
-
+@value: 
 
 <!-- ##### STRUCT CamelContentType ##### -->
 <para>
@@ -303,15 +302,14 @@ camel-mime-utils
 @Returns: 
 
 
-<!-- ##### FUNCTION camel_header_param ##### -->
+<!-- ##### STRUCT camel_header_param ##### -->
 <para>
 
 </para>
 
-@params: 
+@next: 
 @name: 
-@Returns: 
-
+@value: 
 
 <!-- ##### FUNCTION camel_header_set_param ##### -->
 <para>
diff --git a/docs/reference/camel/tmpl/camel-operation.sgml b/docs/reference/camel/tmpl/camel-operation.sgml
index 1555b1b34..d4b330f3e 100644
--- a/docs/reference/camel/tmpl/camel-operation.sgml
+++ b/docs/reference/camel/tmpl/camel-operation.sgml
@@ -87,7 +87,7 @@ camel-operation
 
 @cancellable: 
 @format: 
-@Varargs: 
+@...: 
 
 
 <!-- ##### FUNCTION camel_operation_pop_message ##### -->
diff --git a/docs/reference/camel/tmpl/camel-stream.sgml b/docs/reference/camel/tmpl/camel-stream.sgml
index f293ff658..186b5d9f8 100644
--- a/docs/reference/camel/tmpl/camel-stream.sgml
+++ b/docs/reference/camel/tmpl/camel-stream.sgml
@@ -102,7 +102,7 @@ CamelStream
 
 @stream: 
 @fmt: 
-@Varargs: 
+@...: 
 @Returns: 
 
 
diff --git a/docs/reference/libedataserver/tmpl/e-credentials.sgml b/docs/reference/libedataserver/tmpl/e-credentials.sgml
index 547a5a60d..b4b231481 100644
--- a/docs/reference/libedataserver/tmpl/e-credentials.sgml
+++ b/docs/reference/libedataserver/tmpl/e-credentials.sgml
@@ -122,7 +122,7 @@ ECredentials
 </para>
 
 @key: 
-@Varargs: 
+@...: 
 @Returns: 
 
 
@@ -200,7 +200,7 @@ ECredentials
 @credentials1: 
 @credentials2: 
 @key1: 
-@Varargs: 
+@...: 
 @Returns: 
 
 
diff --git a/docs/reference/libedataserver/tmpl/e-debug-log.sgml b/docs/reference/libedataserver/tmpl/e-debug-log.sgml
index 13acebb8a..0cb2f85a0 100644
--- a/docs/reference/libedataserver/tmpl/e-debug-log.sgml
+++ b/docs/reference/libedataserver/tmpl/e-debug-log.sgml
@@ -49,7 +49,7 @@ e-debug-log
 @is_milestone: 
 @domain: 
 @format: 
-@Varargs: 
+@...: 
 
 
 <!-- ##### FUNCTION e_debug_logv ##### -->
diff --git a/docs/reference/libedataserver/tmpl/e-sexp.sgml b/docs/reference/libedataserver/tmpl/e-sexp.sgml
index 21fa76842..6a82ea2f6 100644
--- a/docs/reference/libedataserver/tmpl/e-sexp.sgml
+++ b/docs/reference/libedataserver/tmpl/e-sexp.sgml
@@ -96,7 +96,7 @@ ESExp
 @Returns: 
 
 
-<!-- ##### FUNCTION e_sexp_ref ##### -->
+<!-- ##### MACRO e_sexp_ref ##### -->
 <para>
 
 </para>
@@ -104,7 +104,7 @@ ESExp
 @f: 
 
 
-<!-- ##### FUNCTION e_sexp_unref ##### -->
+<!-- ##### MACRO e_sexp_unref ##### -->
 <para>
 
 </para>
@@ -268,7 +268,7 @@ ESExp
 
 @f: 
 @why: 
-@Varargs: 
+@...: 
 
 
 <!-- ##### FUNCTION e_sexp_error ##### -->
diff --git a/docs/reference/libedataserver/tmpl/e-source-list.sgml b/docs/reference/libedataserver/tmpl/e-source-list.sgml
index 116b098f3..c54d0e4ab 100644
--- a/docs/reference/libedataserver/tmpl/e-source-list.sgml
+++ b/docs/reference/libedataserver/tmpl/e-source-list.sgml
@@ -113,7 +113,7 @@ ESourceList
 
 @list: 
 @property_name: 
-@Varargs: 
+@...: 
 @Returns: