[evolution-data-server] Update API documentation.



commit f8a2e8ec3d29e02be7f167cc917cac84da5e33f8
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Jul 2 14:52:01 2011 -0400

    Update API documentation.

 addressbook/libebook/e-destination.h               |    7 +-
 addressbook/libebook/e-vcard.h                     |  143 ++--
 addressbook/libedata-book/e-data-book.h            |    2 +-
 calendar/libecal/e-cal-check-timezones.h           |   66 +-
 calendar/libecal/e-cal-client.h                    |    2 +-
 calendar/libecal/e-cal.h                           |    2 -
 calendar/libedata-cal/e-data-cal-view.h            |    2 +-
 .../addressbook/libebook/libebook-docs.sgml        |   10 +-
 .../addressbook/libebook/libebook-sections.txt     |  179 +++-
 docs/reference/addressbook/libebook/libebook.types |    4 +
 .../libebook/tmpl/e-book-client-view.sgml          |  115 +++
 .../addressbook/libebook/tmpl/e-book-client.sgml   |  510 +++++++++++
 .../addressbook/libebook/tmpl/e-destination.sgml   |  140 ++--
 .../addressbook/libebook/tmpl/e-vcard.sgml         |  107 ++-
 .../libedata-book/libedata-book-docs.sgml          |    1 +
 .../libedata-book/libedata-book-sections.txt       |  251 ++++---
 .../tmpl/e-book-backend-sqlitedb.sgml              |  324 +++++++
 .../libedata-book/tmpl/e-book-backend-sync.sgml    |   64 ++
 .../libedata-book/tmpl/e-book-backend.sgml         |  229 +++++
 .../libedata-book/tmpl/e-data-book-factory.sgml    |    9 +
 .../libedata-book/tmpl/e-data-book-view.sgml       |   10 +
 .../libedata-book/tmpl/e-data-book.sgml            |  108 +++-
 docs/reference/calendar/libecal/libecal-docs.sgml  |   10 +-
 .../calendar/libecal/libecal-sections.txt          |  323 +++++---
 docs/reference/calendar/libecal/libecal.types      |    4 +
 .../libecal/tmpl/e-cal-check-timezones.sgml        |   69 ++-
 .../calendar/libecal/tmpl/e-cal-client-view.sgml   |  125 +++
 .../calendar/libecal/tmpl/e-cal-client.sgml        |  919 ++++++++++++++++++++
 .../calendar/libecal/tmpl/e-cal-util.sgml          |    7 +
 docs/reference/calendar/libecal/tmpl/e-cal.sgml    |    9 +
 .../libedata-cal/libedata-cal-sections.txt         |  422 +++++-----
 .../libedata-cal/tmpl/e-cal-backend-sync.sgml      |   99 ++-
 .../calendar/libedata-cal/tmpl/e-cal-backend.sgml  |  329 +++++++-
 .../libedata-cal/tmpl/e-data-cal-factory.sgml      |    9 +
 .../libedata-cal/tmpl/e-data-cal-view.sgml         |   27 +
 .../calendar/libedata-cal/tmpl/e-data-cal.sgml     |  266 ++++++-
 docs/reference/camel/camel-sections.txt            |    3 +-
 .../reference/camel/tmpl/camel-cipher-context.sgml |   12 +
 docs/reference/camel/tmpl/camel-data-cache.sgml    |    9 +
 docs/reference/camel/tmpl/camel-folder-search.sgml |   10 +
 docs/reference/camel/tmpl/camel-unused.sgml        |   10 -
 .../reference/libebackend/libebackend-sections.txt |    5 +
 docs/reference/libebackend/tmpl/e-sqlite3-vfs.sgml |   30 +
 docs/reference/libedataserver/Makefile.am          |    6 +-
 .../libedataserver/libedataserver-docs.sgml        |    3 +
 .../libedataserver/libedataserver-sections.txt     |  119 +++
 docs/reference/libedataserver/libedataserver.types |    2 +
 docs/reference/libedataserver/tmpl/e-client.sgml   |  565 ++++++++++++
 .../libedataserver/tmpl/e-credentials.sgml         |  304 +++++++
 .../libedataserver/tmpl/e-operation-pool.sgml      |   68 ++
 docs/reference/libedataserver/tmpl/e-util.sgml     |   33 +
 .../libedataserverui/libedataserverui-docs.sgml    |    1 +
 .../libedataserverui/libedataserverui-sections.txt |   32 +-
 .../libedataserverui/tmpl/e-client-utils.sgml      |  184 ++++
 .../libedataserverui/tmpl/e-contact-store.sgml     |   38 +-
 .../tmpl/e-name-selector-dialog.sgml               |   10 +
 .../libedataserverui/tmpl/e-name-selector.sgml     |   16 +
 .../tmpl/libedataserverui-unused.sgml              |   42 +
 libedataserver/e-client.h                          |    6 +-
 libedataserver/e-credentials.h                     |    6 +-
 60 files changed, 5630 insertions(+), 787 deletions(-)
---
diff --git a/addressbook/libebook/e-destination.h b/addressbook/libebook/e-destination.h
index 2d12e01..6d6553b 100644
--- a/addressbook/libebook/e-destination.h
+++ b/addressbook/libebook/e-destination.h
@@ -78,9 +78,6 @@ gboolean       e_destination_equal              (const EDestination *a, const ED
 /* for use with EDestinations that wrap a particular contact */
 void           e_destination_set_contact        (EDestination *dest, EContact *contact, gint email_num);
 void           e_destination_set_contact_uid    (EDestination *dest, const gchar *uid, gint email_num);
-#ifndef E_BOOK_DISABLE_DEPRECATED
-void           e_destination_set_book           (EDestination *dest, EBook *book);
-#endif
 void		e_destination_set_client	(EDestination *dest, EBookClient *client);
 EContact      *e_destination_get_contact        (const EDestination *dest);
 const gchar    *e_destination_get_source_uid     (const EDestination *dest);
@@ -130,4 +127,8 @@ void          e_destination_export_to_vcard_attribute   (EDestination *dest, EVC
 
 void           e_destination_freev              (EDestination **destv);
 
+#ifndef E_BOOK_DISABLE_DEPRECATED
+void           e_destination_set_book           (EDestination *dest, EBook *book);
+#endif
+
 #endif /* __E_DESTINATION_H__ */
diff --git a/addressbook/libebook/e-vcard.h b/addressbook/libebook/e-vcard.h
index 4424e20..a673714 100644
--- a/addressbook/libebook/e-vcard.h
+++ b/addressbook/libebook/e-vcard.h
@@ -27,98 +27,99 @@
 
 G_BEGIN_DECLS
 
-#define EVC_ADR             "ADR"
-#define EVC_BDAY            "BDAY"
-#define EVC_CALURI          "CALURI"
-#define EVC_CATEGORIES      "CATEGORIES"
-#define EVC_EMAIL           "EMAIL"
-#define EVC_ENCODING        "ENCODING"
-#define EVC_FBURL           "FBURL"
-#define EVC_FN              "FN"
+#define EVC_ADR				"ADR"
+#define EVC_BDAY			"BDAY"
+#define EVC_CALURI			"CALURI"
+#define EVC_CATEGORIES			"CATEGORIES"
+#define EVC_EMAIL			"EMAIL"
+#define EVC_ENCODING			"ENCODING"
+#define EVC_FBURL			"FBURL"
+#define EVC_FN				"FN"
 
 /**
  * EVC_GEO:
  *
  * Since: 1.12
  **/
-#define EVC_GEO		    "GEO"
-
-#define EVC_ICSCALENDAR     "ICSCALENDAR" /* XXX should this be X-EVOLUTION-ICSCALENDAR? */
-#define EVC_KEY             "KEY"
-#define EVC_LABEL           "LABEL"
-#define EVC_LOGO            "LOGO"
-#define EVC_MAILER          "MAILER"
-#define EVC_NICKNAME        "NICKNAME"
-#define EVC_N               "N"
-#define EVC_NOTE            "NOTE"
-#define EVC_ORG             "ORG"
-#define EVC_PHOTO           "PHOTO"
-#define EVC_PRODID          "PRODID"
-#define EVC_QUOTEDPRINTABLE "QUOTED-PRINTABLE"
-#define EVC_REV             "REV"
-#define EVC_ROLE            "ROLE"
-#define EVC_TEL             "TEL"
-#define EVC_TITLE           "TITLE"
-#define EVC_TYPE            "TYPE"
-#define EVC_UID             "UID"
-#define EVC_URL             "URL"
-#define EVC_VALUE           "VALUE"
-#define EVC_VERSION         "VERSION"
-
-#define EVC_X_AIM              "X-AIM"
-#define EVC_X_ANNIVERSARY      "X-EVOLUTION-ANNIVERSARY"
-#define EVC_X_ASSISTANT        "X-EVOLUTION-ASSISTANT"
-#define EVC_X_BIRTHDAY         "X-EVOLUTION-BIRTHDAY"
-#define EVC_X_BLOG_URL         "X-EVOLUTION-BLOG-URL"
-#define EVC_X_CALLBACK         "X-EVOLUTION-CALLBACK"
-#define EVC_X_COMPANY          "X-EVOLUTION-COMPANY"
-#define EVC_X_DEST_CONTACT_UID "X-EVOLUTION-DEST-CONTACT-UID"
-#ifndef EDS_DISABLE_DEPRECATED
-#define EVC_X_DEST_EMAIL       "X-EVOLUTION-DEST-EMAIL"
-#define EVC_X_DEST_NAME        "X-EVOLUTION-DEST-NAME"
-#endif /* EDS_DISABLE_DEPRECATED */
-#define EVC_X_DEST_EMAIL_NUM   "X-EVOLUTION-DEST-EMAIL-NUM"
-#define EVC_X_DEST_HTML_MAIL   "X-EVOLUTION-DEST-HTML-MAIL"
-#define EVC_X_DEST_SOURCE_UID  "X-EVOLUTION-DEST-SOURCE-UID"
-#define EVC_X_FILE_AS          "X-EVOLUTION-FILE-AS"
-#define EVC_X_ICQ              "X-ICQ"
-#define EVC_X_JABBER           "X-JABBER"
-#define EVC_X_LIST_SHOW_ADDRESSES "X-EVOLUTION-LIST-SHOW-ADDRESSES"
-#define EVC_X_LIST		"X-EVOLUTION-LIST"
-#define EVC_X_LIST_NAME		"X-EVOLUTION-LIST-NAME"
-#define EVC_X_MANAGER		"X-EVOLUTION-MANAGER"
-#define EVC_X_MSN		"X-MSN"
-
-/* Constants for Evo contact lists only */
-#define EVC_CONTACT_LIST	"X-EVOLUTION-CONTACT-LIST-INFO"
-#define EVC_PARENT_CL		"X-EVOLUTION-PARENT-UID"
-#define EVC_CL_UID		"X-EVOLUTION-CONTACT-LIST-UID"
+#define EVC_GEO				"GEO"
+
+/* XXX should this be X-EVOLUTION-ICSCALENDAR? */
+#define EVC_ICSCALENDAR			"ICSCALENDAR"
+#define EVC_KEY				"KEY"
+#define EVC_LABEL			"LABEL"
+#define EVC_LOGO			"LOGO"
+#define EVC_MAILER			"MAILER"
+#define EVC_NICKNAME			"NICKNAME"
+#define EVC_N				"N"
+#define EVC_NOTE			"NOTE"
+#define EVC_ORG				"ORG"
+#define EVC_PHOTO			"PHOTO"
+#define EVC_PRODID			"PRODID"
+#define EVC_QUOTEDPRINTABLE		"QUOTED-PRINTABLE"
+#define EVC_REV				"REV"
+#define EVC_ROLE			"ROLE"
+#define EVC_TEL				"TEL"
+#define EVC_TITLE			"TITLE"
+#define EVC_TYPE			"TYPE"
+#define EVC_UID				"UID"
+#define EVC_URL				"URL"
+#define EVC_VALUE			"VALUE"
+#define EVC_VERSION			"VERSION"
+
+#define EVC_X_AIM			"X-AIM"
+#define EVC_X_ANNIVERSARY		"X-EVOLUTION-ANNIVERSARY"
+#define EVC_X_ASSISTANT			"X-EVOLUTION-ASSISTANT"
+#define EVC_X_BIRTHDAY			"X-EVOLUTION-BIRTHDAY"
+#define EVC_X_BLOG_URL			"X-EVOLUTION-BLOG-URL"
+#define EVC_X_CALLBACK			"X-EVOLUTION-CALLBACK"
+#define EVC_X_COMPANY			"X-EVOLUTION-COMPANY"
+#define EVC_X_DEST_CONTACT_UID		"X-EVOLUTION-DEST-CONTACT-UID"
+#define EVC_X_DEST_EMAIL_NUM		"X-EVOLUTION-DEST-EMAIL-NUM"
+#define EVC_X_DEST_HTML_MAIL		"X-EVOLUTION-DEST-HTML-MAIL"
+#define EVC_X_DEST_SOURCE_UID		"X-EVOLUTION-DEST-SOURCE-UID"
+#define EVC_X_FILE_AS			"X-EVOLUTION-FILE-AS"
+#define EVC_X_GADUGADU			"X-GADUGADU"
+#define EVC_X_GROUPWISE			"X-GROUPWISE"
+#define EVC_X_ICQ			"X-ICQ"
+#define EVC_X_JABBER			"X-JABBER"
+#define EVC_X_LIST_SHOW_ADDRESSES	"X-EVOLUTION-LIST-SHOW-ADDRESSES"
+#define EVC_X_LIST			"X-EVOLUTION-LIST"
+#define EVC_X_LIST_NAME			"X-EVOLUTION-LIST-NAME"
+#define EVC_X_MANAGER			"X-EVOLUTION-MANAGER"
+#define EVC_X_MSN			"X-MSN"
+#define EVC_X_RADIO			"X-EVOLUTION-RADIO"
 
 /**
  * EVC_X_SKYPE:
  *
  * Since: 2.26
  **/
-#define EVC_X_SKYPE		"X-SKYPE"
-
-#define EVC_X_RADIO		"X-EVOLUTION-RADIO"
+#define EVC_X_SKYPE			"X-SKYPE"
 
 /**
  * EVC_X_SIP:
  *
  * Since: 2.26
  **/
-#define EVC_X_SIP		"X-SIP"
-
-#define EVC_X_SPOUSE		"X-EVOLUTION-SPOUSE"
-#define EVC_X_TELEX		"X-EVOLUTION-TELEX"
-#define EVC_X_TTYTDD		"X-EVOLUTION-TTYTDD"
-#define EVC_X_VIDEO_URL	"X-EVOLUTION-VIDEO-URL"
-#define EVC_X_WANTS_HTML	"X-MOZILLA-HTML"
-#define EVC_X_YAHOO		"X-YAHOO"
-#define EVC_X_GADUGADU          "X-GADUGADU"
-#define EVC_X_GROUPWISE	"X-GROUPWISE"
-#define EVC_X_BOOK_URI	"X-EVOLUTION-BOOK-URI"
+#define EVC_X_SIP			"X-SIP"
+
+#define EVC_X_SPOUSE			"X-EVOLUTION-SPOUSE"
+#define EVC_X_TELEX			"X-EVOLUTION-TELEX"
+#define EVC_X_TTYTDD			"X-EVOLUTION-TTYTDD"
+#define EVC_X_VIDEO_URL			"X-EVOLUTION-VIDEO-URL"
+#define EVC_X_WANTS_HTML		"X-MOZILLA-HTML"
+#define EVC_X_YAHOO			"X-YAHOO"
+#define EVC_X_BOOK_URI			"X-EVOLUTION-BOOK-URI"
+
+/* Constants for Evo contact lists only */
+#define EVC_CONTACT_LIST		"X-EVOLUTION-CONTACT-LIST-INFO"
+#define EVC_PARENT_CL			"X-EVOLUTION-PARENT-UID"
+#define EVC_CL_UID			"X-EVOLUTION-CONTACT-LIST-UID"
+
+#ifndef EDS_DISABLE_DEPRECATED
+#define EVC_X_DEST_EMAIL		"X-EVOLUTION-DEST-EMAIL"
+#define EVC_X_DEST_NAME			"X-EVOLUTION-DEST-NAME"
+#endif /* EDS_DISABLE_DEPRECATED */
 
 typedef enum {
 	EVC_FORMAT_VCARD_21,
diff --git a/addressbook/libedata-book/e-data-book.h b/addressbook/libedata-book/e-data-book.h
index 0a1ed32..5185eba 100644
--- a/addressbook/libedata-book/e-data-book.h
+++ b/addressbook/libedata-book/e-data-book.h
@@ -104,7 +104,7 @@ const gchar *e_data_book_status_to_string (EDataBookStatus status);
 	} G_STMT_END
 
 /**
- * e_return_data_book_error_if_fail:
+ * e_return_data_book_error_val_if_fail:
  *
  * Same as e_return_data_book_error_if_fail(), only returns FALSE on a failure
  *
diff --git a/calendar/libecal/e-cal-check-timezones.h b/calendar/libecal/e-cal-check-timezones.h
index 1a27c0b..5f7dead 100644
--- a/calendar/libecal/e-cal-check-timezones.h
+++ b/calendar/libecal/e-cal-check-timezones.h
@@ -26,51 +26,43 @@
 
 G_BEGIN_DECLS
 
-#ifndef E_CAL_DISABLE_DEPRECATED
+gboolean	e_cal_client_check_timezones	(icalcomponent *comp,
+						 GList *comps,
+						 icaltimezone *(*tzlookup) (const gchar *tzid, gconstpointer ecalclient, GCancellable *cancellable, GError **error),
+						 gconstpointer ecalclient,
+						 GCancellable *cancellable,
+						 GError **error);
 
-gboolean e_cal_check_timezones (icalcomponent *comp,
-                               GList *comps,
-                               icaltimezone *(*tzlookup)(const gchar *tzid,
-                                                         gconstpointer custom,
-                                                         GError **error),
-                               gconstpointer custom,
-                               GError **error);
+icaltimezone *	e_cal_client_tzlookup		(const gchar *tzid,
+						 gconstpointer ecalclient,
+						 GCancellable *cancellable,
+						 GError **error);
 
-icaltimezone *e_cal_tzlookup_ecal (const gchar *tzid,
-                                  gconstpointer custom,
-                                  GError **error);
+icaltimezone *	e_cal_client_tzlookup_icomp
+						(const gchar *tzid,
+						 gconstpointer custom,
+						 GCancellable *cancellable,
+						 GError **error);
 
-icaltimezone *e_cal_tzlookup_icomp
-				(const gchar *tzid,
-				 gconstpointer custom,
-				 GError **error);
+const gchar *	e_cal_match_tzid		(const gchar *tzid);
 
-#endif /* E_CAL_DISABLE_DEPRECATED */
+#ifndef E_CAL_DISABLE_DEPRECATED
 
-gboolean e_cal_client_check_timezones
-				(icalcomponent *comp,
-				 GList *comps,
-				 icaltimezone *(*tzlookup) (const gchar *tzid,
-							    gconstpointer ecalclient,
-							    GCancellable *cancellable,
-                                                            GError **error),
-				 gconstpointer ecalclient,
-				 GCancellable *cancellable,
-				 GError **error);
+gboolean	e_cal_check_timezones		(icalcomponent *comp,
+						 GList *comps,
+						 icaltimezone * (*tzlookup) (const gchar *tzid, gconstpointer custom, GError **error),
+						 gconstpointer custom,
+						 GError **error);
 
-icaltimezone *e_cal_client_tzlookup
-				(const gchar *tzid,
-				 gconstpointer ecalclient,
-				 GCancellable *cancellable,
-				 GError **error);
+icaltimezone *	e_cal_tzlookup_ecal		(const gchar *tzid,
+						 gconstpointer custom,
+						 GError **error);
 
-icaltimezone *e_cal_client_tzlookup_icomp
-				(const gchar *tzid,
-				 gconstpointer custom,
-				 GCancellable *cancellable,
-				 GError **error);
+icaltimezone *	e_cal_tzlookup_icomp		(const gchar *tzid,
+						 gconstpointer custom,
+						 GError **error);
 
-const gchar *e_cal_match_tzid (const gchar *tzid);
+#endif /* E_CAL_DISABLE_DEPRECATED */
 
 G_END_DECLS
 
diff --git a/calendar/libecal/e-cal-client.h b/calendar/libecal/e-cal-client.h
index debdbc6..5010b5e 100644
--- a/calendar/libecal/e-cal-client.h
+++ b/calendar/libecal/e-cal-client.h
@@ -102,7 +102,7 @@ gboolean		e_cal_client_get_sources		(ESourceList **sources, ECalClientSourceType
 ECalClientSourceType	e_cal_client_get_source_type		(ECalClient *client);
 const gchar *		e_cal_client_get_local_attachment_store	(ECalClient *client);
 void			e_cal_client_set_default_timezone	(ECalClient *client, /* const */ icaltimezone *zone);
-/*const*/ icaltimezone *e_cal_client_get_default_timezone	(ECalClient *client);
+icaltimezone *		e_cal_client_get_default_timezone	(ECalClient *client);
 
 /* Check predefined capabilities */
 gboolean		e_cal_client_check_one_alarm_only	(ECalClient *client);
diff --git a/calendar/libecal/e-cal.h b/calendar/libecal/e-cal.h
index ae003e7..7908aae 100644
--- a/calendar/libecal/e-cal.h
+++ b/calendar/libecal/e-cal.h
@@ -71,13 +71,11 @@ typedef enum {
 	E_CAL_LOAD_LOADED
 } ECalLoadState;
 
-#ifndef E_CAL_DISABLE_DEPRECATED
 typedef enum {
 	Local = 1 << 0,
 	Remote = 1 << 1,
 	AnyMode = 0x07
 } EDataCalMode;
-#endif
 
 struct _ECal {
 	GObject object;
diff --git a/calendar/libedata-cal/e-data-cal-view.h b/calendar/libedata-cal/e-data-cal-view.h
index 0bdf6c2..06a0f2e 100644
--- a/calendar/libedata-cal/e-data-cal-view.h
+++ b/calendar/libedata-cal/e-data-cal-view.h
@@ -55,7 +55,7 @@ gboolean		e_data_cal_view_object_matches			(EDataCalView *view, const gchar *obj
 gboolean		e_data_cal_view_is_started			(EDataCalView *view);
 gboolean		e_data_cal_view_is_completed			(EDataCalView *view);
 gboolean		e_data_cal_view_is_stopped			(EDataCalView *view);
-/* const */ GHashTable *e_data_cal_view_get_fields_of_interest		(EDataCalView *view);
+GHashTable *		e_data_cal_view_get_fields_of_interest		(EDataCalView *view);
 
 void			e_data_cal_view_notify_objects_added		(EDataCalView *view, const GSList *objects);
 void			e_data_cal_view_notify_objects_added_1		(EDataCalView *view, const gchar *object);
diff --git a/docs/reference/addressbook/libebook/libebook-docs.sgml b/docs/reference/addressbook/libebook/libebook-docs.sgml
index 7f94a56..2bf3555 100644
--- a/docs/reference/addressbook/libebook/libebook-docs.sgml
+++ b/docs/reference/addressbook/libebook/libebook-docs.sgml
@@ -10,10 +10,10 @@
 
   <chapter>
     <title>Evolution-Data-Server Manual: Address Book Client (libebook)</title>
-    <xi:include href="xml/e-book.xml"/>
+    <xi:include href="xml/e-book-client.xml"/>
+    <xi:include href="xml/e-book-client-view.xml"/>
     <xi:include href="xml/e-book-query.xml"/>
     <xi:include href="xml/e-book-types.xml"/>
-    <xi:include href="xml/e-book-view.xml"/>
     <xi:include href="xml/e-vcard.xml"/>
     <xi:include href="xml/e-contact.xml"/>
     <xi:include href="xml/e-destination.xml"/>
@@ -21,6 +21,12 @@
     <xi:include href="xml/e-name-western.xml"/>
   </chapter>
 
+  <chapter>
+    <title>Deprecated Classes</title>
+    <xi:include href="xml/e-book.xml"/>
+    <xi:include href="xml/e-book-view.xml"/>
+  </chapter>
+
   <index id="api-index-full">
     <title>Index</title>
     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
diff --git a/docs/reference/addressbook/libebook/libebook-sections.txt b/docs/reference/addressbook/libebook/libebook-sections.txt
index be7f0e6..0a7b912 100644
--- a/docs/reference/addressbook/libebook/libebook-sections.txt
+++ b/docs/reference/addressbook/libebook/libebook-sections.txt
@@ -119,6 +119,90 @@ EBookPrivate
 </SECTION>
 
 <SECTION>
+<FILE>e-book-client</FILE>
+<TITLE>EBookClient</TITLE>
+BOOK_BACKEND_PROPERTY_REQUIRED_FIELDS
+BOOK_BACKEND_PROPERTY_SUPPORTED_FIELDS
+BOOK_BACKEND_PROPERTY_SUPPORTED_AUTH_METHODS
+E_BOOK_CLIENT_ERROR
+EBookClientError
+e_book_client_error_to_string
+e_book_client_error_create
+EBookClient
+e_book_client_new
+e_book_client_new_from_uri
+e_book_client_new_system
+e_book_client_new_default
+e_book_client_set_default
+e_book_client_set_default_source
+e_book_client_get_sources
+e_book_client_get_self
+e_book_client_set_self
+e_book_client_is_self
+e_book_client_add_contact
+e_book_client_add_contact_finish
+e_book_client_add_contact_sync
+e_book_client_modify_contact
+e_book_client_modify_contact_finish
+e_book_client_modify_contact_sync
+e_book_client_remove_contact
+e_book_client_remove_contact_finish
+e_book_client_remove_contact_sync
+e_book_client_remove_contact_by_uid
+e_book_client_remove_contact_by_uid_finish
+e_book_client_remove_contact_by_uid_sync
+e_book_client_remove_contacts
+e_book_client_remove_contacts_finish
+e_book_client_remove_contacts_sync
+e_book_client_get_contact
+e_book_client_get_contact_finish
+e_book_client_get_contact_sync
+e_book_client_get_contacts
+e_book_client_get_contacts_finish
+e_book_client_get_contacts_sync
+e_book_client_get_contacts_uids
+e_book_client_get_contacts_uids_finish
+e_book_client_get_contacts_uids_sync
+e_book_client_get_view
+e_book_client_get_view_finish
+e_book_client_get_view_sync
+<SUBSECTION Standard>
+E_BOOK_CLIENT
+E_IS_BOOK_CLIENT
+E_TYPE_BOOK_CLIENT
+E_BOOK_CLIENT_CLASS
+E_IS_BOOK_CLIENT_CLASS
+E_BOOK_CLIENT_GET_CLASS
+EBookClientClass
+e_book_client_get_type
+<SUBSECTION Private>
+EBookClientPrivate
+e_book_client_error_quark
+</SECTION>
+
+<SECTION>
+<FILE>e-book-client-view</FILE>
+<TITLE>EBookClientView</TITLE>
+EBookClientView
+e_book_client_view_get_client
+e_book_client_view_is_running
+e_book_client_view_set_fields_of_interest
+e_book_client_view_start
+e_book_client_view_stop
+<SUBSECTION Standard>
+E_BOOK_CLIENT_VIEW
+E_IS_BOOK_CLIENT_VIEW
+E_TYPE_BOOK_CLIENT_VIEW
+E_BOOK_CLIENT_VIEW_CLASS
+E_IS_BOOK_CLIENT_VIEW_CLASS
+E_BOOK_CLIENT_VIEW_GET_CLASS
+EBookClientViewClass
+e_book_client_view_get_type
+<SUBSECTION Private>
+EBookClientViewPrivate
+</SECTION>
+
+<SECTION>
 <FILE>e-contact</FILE>
 <TITLE>EContact</TITLE>
 EContact
@@ -199,6 +283,7 @@ EVCardAttributeParam
 e_vcard_new
 e_vcard_new_from_string
 e_vcard_to_string
+e_vcard_is_parsed
 e_vcard_dump_structure
 e_vcard_attribute_new
 e_vcard_attribute_free
@@ -279,42 +364,50 @@ EVC_X_ANNIVERSARY
 EVC_X_ASSISTANT
 EVC_X_BIRTHDAY
 EVC_X_BLOG_URL
+EVC_X_CALLBACK
+EVC_X_COMPANY
+EVC_X_DEST_CONTACT_UID
+EVC_X_DEST_EMAIL_NUM
+EVC_X_DEST_HTML_MAIL
+EVC_X_DEST_SOURCE_UID
 EVC_X_FILE_AS
 EVC_X_GADUGADU
+EVC_X_GROUPWISE
 EVC_X_ICQ
 EVC_X_JABBER
 EVC_X_LIST_SHOW_ADDRESSES
 EVC_X_LIST
+EVC_X_LIST_NAME
 EVC_X_MANAGER
 EVC_X_MSN
-EVC_X_SKYPE
-EVC_X_WANTS_HTML
-EVC_X_YAHOO
-EVC_X_BOOK_URI
-EVC_X_CALLBACK
-EVC_X_COMPANY
-EVC_X_DEST_CONTACT_UID
-EVC_X_DEST_EMAIL
-EVC_X_DEST_EMAIL_NUM
-EVC_X_DEST_HTML_MAIL
-EVC_X_DEST_NAME
-EVC_X_DEST_SOURCE_UID
-EVC_X_GROUPWISE
 EVC_X_RADIO
+EVC_X_SKYPE
 EVC_X_SIP
 EVC_X_SPOUSE
 EVC_X_TELEX
 EVC_X_TTYTDD
 EVC_X_VIDEO_URL
+EVC_X_WANTS_HTML
+EVC_X_YAHOO
+EVC_X_BOOK_URI
+EVC_CONTACT_LIST
+EVC_PARENT_CL
+EVC_CL_UID
+EVC_X_DEST_EMAIL
+EVC_X_DEST_NAME
 <SUBSECTION Standard>
-EVCardClass
 E_VCARD
 E_IS_VCARD
 E_TYPE_VCARD
-e_vcard_get_type
 E_VCARD_CLASS
 E_IS_VCARD_CLASS
 E_VCARD_GET_CLASS
+E_TYPE_VCARD_ATTRIBUTE
+E_TYPE_VCARD_PARAM_ATTRIBUTE
+EVCardClass
+e_vcard_get_type
+e_vcard_attribute_get_type
+e_vcard_attribute_param_get_type
 <SUBSECTION Private>
 EVCardPrivate
 e_vcard_construct
@@ -375,47 +468,49 @@ e_name_western_free
 <FILE>e-destination</FILE>
 <TITLE>EDestination</TITLE>
 EDestination
+e_destination_new
 e_destination_copy
 e_destination_empty
 e_destination_equal
-e_destination_export
-e_destination_export_to_vcard_attribute
-e_destination_exportv
-e_destination_freev
-e_destination_get_address
+e_destination_set_contact
+e_destination_set_contact_uid
+e_destination_set_client
 e_destination_get_contact
+e_destination_get_source_uid
 e_destination_get_contact_uid
-e_destination_get_email
 e_destination_get_email_num
-e_destination_get_html_mail_pref
+e_destination_set_name
+e_destination_set_email
 e_destination_get_name
-e_destination_get_source_uid
+e_destination_get_email
+e_destination_get_address
+e_destination_is_evolution_list
+e_destination_list_show_addresses
+e_destination_list_get_dests
+e_destination_list_get_root_dests
+e_destination_is_ignored
+e_destination_set_ignored
+e_destination_set_html_mail_pref
+e_destination_get_html_mail_pref
+e_destination_is_auto_recipient
+e_destination_set_auto_recipient
+e_destination_set_raw
 e_destination_get_textrep
 e_destination_get_textrepv
+e_destination_export
+e_destination_exportv
 e_destination_import
 e_destination_importv
-e_destination_is_auto_recipient
-e_destination_is_evolution_list
-e_destination_is_ignored
-e_destination_list_get_dests
-e_destination_list_show_addresses
-e_destination_new
-e_destination_set_auto_recipient
+e_destination_export_to_vcard_attribute
+e_destination_freev
 e_destination_set_book
-e_destination_set_contact
-e_destination_set_contact_uid
-e_destination_set_email
-e_destination_set_html_mail_pref
-e_destination_set_ignored
-e_destination_set_name
-e_destination_set_raw
 <SUBSECTION Standard>
-e_destination_get_type
-EDestinationClass
-E_TYPE_DESTINATION
 E_DESTINATION
-E_DESTINATION_CLASS
-E_DESTINATION_GET_CLASS
 E_IS_DESTINATION
+E_TYPE_DESTINATION
+E_DESTINATION_CLASS
 E_IS_DESTINATION_CLASS
+E_DESTINATION_GET_CLASS
+EDestinationClass
+e_destination_get_type
 </SECTION>
diff --git a/docs/reference/addressbook/libebook/libebook.types b/docs/reference/addressbook/libebook/libebook.types
index 4dd5f9f..a52ebb9 100644
--- a/docs/reference/addressbook/libebook/libebook.types
+++ b/docs/reference/addressbook/libebook/libebook.types
@@ -1,10 +1,14 @@
 #include <libebook/e-book.h>
+#include <libebook/e-book-client.h>
+#include <libebook/e-book-client-view.h>
 #include <libebook/e-book-view.h>
 #include <libebook/e-contact.h>
 #include <libebook/e-destination.h>
 #include <libebook/e-vcard.h>
 
 e_book_get_type
+e_book_client_get_type
+e_book_client_view_get_type
 e_book_view_get_type
 e_contact_get_type
 e_destination_get_type
diff --git a/docs/reference/addressbook/libebook/tmpl/e-book-client-view.sgml b/docs/reference/addressbook/libebook/tmpl/e-book-client-view.sgml
new file mode 100644
index 0000000..fc3f8a7
--- /dev/null
+++ b/docs/reference/addressbook/libebook/tmpl/e-book-client-view.sgml
@@ -0,0 +1,115 @@
+<!-- ##### SECTION Title ##### -->
+EBookClientView
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT EBookClientView ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SIGNAL EBookClientView::complete ##### -->
+<para>
+
+</para>
+
+ ebookclientview: the object which received the signal.
+ arg1: 
+
+<!-- ##### SIGNAL EBookClientView::objects-added ##### -->
+<para>
+
+</para>
+
+ ebookclientview: the object which received the signal.
+ arg1: 
+
+<!-- ##### SIGNAL EBookClientView::objects-modified ##### -->
+<para>
+
+</para>
+
+ ebookclientview: the object which received the signal.
+ arg1: 
+
+<!-- ##### SIGNAL EBookClientView::objects-removed ##### -->
+<para>
+
+</para>
+
+ ebookclientview: the object which received the signal.
+ arg1: 
+
+<!-- ##### SIGNAL EBookClientView::progress ##### -->
+<para>
+
+</para>
+
+ ebookclientview: the object which received the signal.
+ arg1: 
+ arg2: 
+
+<!-- ##### FUNCTION e_book_client_view_get_client ##### -->
+<para>
+
+</para>
+
+ view: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_view_is_running ##### -->
+<para>
+
+</para>
+
+ view: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_view_set_fields_of_interest ##### -->
+<para>
+
+</para>
+
+ view: 
+ fields_of_interest: 
+ error: 
+
+
+<!-- ##### FUNCTION e_book_client_view_start ##### -->
+<para>
+
+</para>
+
+ view: 
+ error: 
+
+
+<!-- ##### FUNCTION e_book_client_view_stop ##### -->
+<para>
+
+</para>
+
+ view: 
+ error: 
+
+
diff --git a/docs/reference/addressbook/libebook/tmpl/e-book-client.sgml b/docs/reference/addressbook/libebook/tmpl/e-book-client.sgml
new file mode 100644
index 0000000..5ba515c
--- /dev/null
+++ b/docs/reference/addressbook/libebook/tmpl/e-book-client.sgml
@@ -0,0 +1,510 @@
+<!-- ##### SECTION Title ##### -->
+EBookClient
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### MACRO BOOK_BACKEND_PROPERTY_REQUIRED_FIELDS ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO BOOK_BACKEND_PROPERTY_SUPPORTED_FIELDS ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO BOOK_BACKEND_PROPERTY_SUPPORTED_AUTH_METHODS ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO E_BOOK_CLIENT_ERROR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### ENUM EBookClientError ##### -->
+<para>
+
+</para>
+
+ E_BOOK_CLIENT_ERROR_NO_SUCH_BOOK: 
+ E_BOOK_CLIENT_ERROR_CONTACT_NOT_FOUND: 
+ E_BOOK_CLIENT_ERROR_CONTACT_ID_ALREADY_EXISTS: 
+ E_BOOK_CLIENT_ERROR_NO_SUCH_SOURCE: 
+ E_BOOK_CLIENT_ERROR_NO_SPACE: 
+
+<!-- ##### FUNCTION e_book_client_error_to_string ##### -->
+<para>
+
+</para>
+
+ code: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_error_create ##### -->
+<para>
+
+</para>
+
+ code: 
+ custom_msg: 
+ Returns: 
+
+
+<!-- ##### STRUCT EBookClient ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### FUNCTION e_book_client_new ##### -->
+<para>
+
+</para>
+
+ source: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_new_from_uri ##### -->
+<para>
+
+</para>
+
+ uri: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_new_system ##### -->
+<para>
+
+</para>
+
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_new_default ##### -->
+<para>
+
+</para>
+
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_set_default ##### -->
+<para>
+
+</para>
+
+ client: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_set_default_source ##### -->
+<para>
+
+</para>
+
+ source: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_get_sources ##### -->
+<para>
+
+</para>
+
+ sources: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_get_self ##### -->
+<para>
+
+</para>
+
+ contact: 
+ client: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_set_self ##### -->
+<para>
+
+</para>
+
+ client: 
+ contact: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_is_self ##### -->
+<para>
+
+</para>
+
+ contact: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_add_contact ##### -->
+<para>
+
+</para>
+
+ client: 
+ contact: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_book_client_add_contact_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ added_uid: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_add_contact_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ contact: 
+ added_uid: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_modify_contact ##### -->
+<para>
+
+</para>
+
+ client: 
+ contact: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_book_client_modify_contact_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_modify_contact_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ contact: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_remove_contact ##### -->
+<para>
+
+</para>
+
+ client: 
+ contact: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_book_client_remove_contact_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_remove_contact_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ contact: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_remove_contact_by_uid ##### -->
+<para>
+
+</para>
+
+ client: 
+ uid: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_book_client_remove_contact_by_uid_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_remove_contact_by_uid_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ uid: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_remove_contacts ##### -->
+<para>
+
+</para>
+
+ client: 
+ uids: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_book_client_remove_contacts_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_remove_contacts_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ uids: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_get_contact ##### -->
+<para>
+
+</para>
+
+ client: 
+ uid: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_book_client_get_contact_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ contact: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_get_contact_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ uid: 
+ contact: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_get_contacts ##### -->
+<para>
+
+</para>
+
+ client: 
+ sexp: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_book_client_get_contacts_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ contacts: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_get_contacts_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ sexp: 
+ contacts: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_get_contacts_uids ##### -->
+<para>
+
+</para>
+
+ client: 
+ sexp: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_book_client_get_contacts_uids_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ contacts_uids: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_get_contacts_uids_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ sexp: 
+ contacts_uids: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_get_view ##### -->
+<para>
+
+</para>
+
+ client: 
+ sexp: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_book_client_get_view_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ view: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_client_get_view_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ sexp: 
+ view: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
diff --git a/docs/reference/addressbook/libebook/tmpl/e-destination.sgml b/docs/reference/addressbook/libebook/tmpl/e-destination.sgml
index 7198eaf..b76062b 100644
--- a/docs/reference/addressbook/libebook/tmpl/e-destination.sgml
+++ b/docs/reference/addressbook/libebook/tmpl/e-destination.sgml
@@ -33,16 +33,16 @@ EDestination
 
 @edestination: the object which received the signal.
 
-<!-- ##### FUNCTION e_destination_copy ##### -->
+<!-- ##### FUNCTION e_destination_new ##### -->
 <para>
 
 </para>
 
- dest: 
+ void: 
 @Returns: 
 
 
-<!-- ##### FUNCTION e_destination_empty ##### -->
+<!-- ##### FUNCTION e_destination_copy ##### -->
 <para>
 
 </para>
@@ -51,52 +51,55 @@ EDestination
 @Returns: 
 
 
-<!-- ##### FUNCTION e_destination_equal ##### -->
+<!-- ##### FUNCTION e_destination_empty ##### -->
 <para>
 
 </para>
 
- a: 
- b: 
+ dest: 
 @Returns: 
 
 
-<!-- ##### FUNCTION e_destination_export ##### -->
+<!-- ##### FUNCTION e_destination_equal ##### -->
 <para>
 
 </para>
 
- dest: 
+ a: 
+ b: 
 @Returns: 
 
 
-<!-- ##### FUNCTION e_destination_export_to_vcard_attribute ##### -->
+<!-- ##### FUNCTION e_destination_set_contact ##### -->
 <para>
 
 </para>
 
 @dest: 
- attr: 
+ contact: 
+ email_num: 
 
 
-<!-- ##### FUNCTION e_destination_exportv ##### -->
+<!-- ##### FUNCTION e_destination_set_contact_uid ##### -->
 <para>
 
 </para>
 
- destv: 
- Returns: 
+ dest: 
+ uid: 
+ email_num: 
 
 
-<!-- ##### FUNCTION e_destination_freev ##### -->
+<!-- ##### FUNCTION e_destination_set_client ##### -->
 <para>
 
 </para>
 
- destv: 
+ dest: 
+ client: 
 
 
-<!-- ##### FUNCTION e_destination_get_address ##### -->
+<!-- ##### FUNCTION e_destination_get_contact ##### -->
 <para>
 
 </para>
@@ -105,7 +108,7 @@ EDestination
 @Returns: 
 
 
-<!-- ##### FUNCTION e_destination_get_contact ##### -->
+<!-- ##### FUNCTION e_destination_get_source_uid ##### -->
 <para>
 
 </para>
@@ -123,7 +126,7 @@ EDestination
 @Returns: 
 
 
-<!-- ##### FUNCTION e_destination_get_email ##### -->
+<!-- ##### FUNCTION e_destination_get_email_num ##### -->
 <para>
 
 </para>
@@ -132,22 +135,22 @@ EDestination
 @Returns: 
 
 
-<!-- ##### FUNCTION e_destination_get_email_num ##### -->
+<!-- ##### FUNCTION e_destination_set_name ##### -->
 <para>
 
 </para>
 
 @dest: 
- Returns: 
+ name: 
 
 
-<!-- ##### FUNCTION e_destination_get_html_mail_pref ##### -->
+<!-- ##### FUNCTION e_destination_set_email ##### -->
 <para>
 
 </para>
 
 @dest: 
- Returns: 
+ email: 
 
 
 <!-- ##### FUNCTION e_destination_get_name ##### -->
@@ -159,7 +162,7 @@ EDestination
 @Returns: 
 
 
-<!-- ##### FUNCTION e_destination_get_source_uid ##### -->
+<!-- ##### FUNCTION e_destination_get_email ##### -->
 <para>
 
 </para>
@@ -168,44 +171,43 @@ EDestination
 @Returns: 
 
 
-<!-- ##### FUNCTION e_destination_get_textrep ##### -->
+<!-- ##### FUNCTION e_destination_get_address ##### -->
 <para>
 
 </para>
 
 @dest: 
- include_email: 
 @Returns: 
 
 
-<!-- ##### FUNCTION e_destination_get_textrepv ##### -->
+<!-- ##### FUNCTION e_destination_is_evolution_list ##### -->
 <para>
 
 </para>
 
- destv: 
+ dest: 
 @Returns: 
 
 
-<!-- ##### FUNCTION e_destination_import ##### -->
+<!-- ##### FUNCTION e_destination_list_show_addresses ##### -->
 <para>
 
 </para>
 
- str: 
+ dest: 
 @Returns: 
 
 
-<!-- ##### FUNCTION e_destination_importv ##### -->
+<!-- ##### FUNCTION e_destination_list_get_dests ##### -->
 <para>
 
 </para>
 
- str: 
+ dest: 
 @Returns: 
 
 
-<!-- ##### FUNCTION e_destination_is_auto_recipient ##### -->
+<!-- ##### FUNCTION e_destination_list_get_root_dests ##### -->
 <para>
 
 </para>
@@ -214,7 +216,7 @@ EDestination
 @Returns: 
 
 
-<!-- ##### FUNCTION e_destination_is_evolution_list ##### -->
+<!-- ##### FUNCTION e_destination_is_ignored ##### -->
 <para>
 
 </para>
@@ -223,25 +225,25 @@ EDestination
 @Returns: 
 
 
-<!-- ##### FUNCTION e_destination_is_ignored ##### -->
+<!-- ##### FUNCTION e_destination_set_ignored ##### -->
 <para>
 
 </para>
 
 @dest: 
- Returns: 
+ ignored: 
 
 
-<!-- ##### FUNCTION e_destination_list_get_dests ##### -->
+<!-- ##### FUNCTION e_destination_set_html_mail_pref ##### -->
 <para>
 
 </para>
 
 @dest: 
- Returns: 
+ flag: 
 
 
-<!-- ##### FUNCTION e_destination_list_show_addresses ##### -->
+<!-- ##### FUNCTION e_destination_get_html_mail_pref ##### -->
 <para>
 
 </para>
@@ -250,12 +252,12 @@ EDestination
 @Returns: 
 
 
-<!-- ##### FUNCTION e_destination_new ##### -->
+<!-- ##### FUNCTION e_destination_is_auto_recipient ##### -->
 <para>
 
 </para>
 
- void: 
+ dest: 
 @Returns: 
 
 
@@ -268,77 +270,93 @@ EDestination
 @value: 
 
 
-<!-- ##### FUNCTION e_destination_set_book ##### -->
+<!-- ##### FUNCTION e_destination_set_raw ##### -->
 <para>
 
 </para>
 
 @dest: 
- book: 
+ raw: 
 
 
-<!-- ##### FUNCTION e_destination_set_contact ##### -->
+<!-- ##### FUNCTION e_destination_get_textrep ##### -->
 <para>
 
 </para>
 
 @dest: 
- contact: 
- email_num: 
+ include_email: 
+ Returns: 
 
 
-<!-- ##### FUNCTION e_destination_set_contact_uid ##### -->
+<!-- ##### FUNCTION e_destination_get_textrepv ##### -->
 <para>
 
 </para>
 
- dest: 
- uid: 
- email_num: 
+ destv: 
+ Returns: 
 
 
-<!-- ##### FUNCTION e_destination_set_email ##### -->
+<!-- ##### FUNCTION e_destination_export ##### -->
 <para>
 
 </para>
 
 @dest: 
- email: 
+ Returns: 
 
 
-<!-- ##### FUNCTION e_destination_set_html_mail_pref ##### -->
+<!-- ##### FUNCTION e_destination_exportv ##### -->
 <para>
 
 </para>
 
- dest: 
- flag: 
+ destv: 
+ Returns: 
 
 
-<!-- ##### FUNCTION e_destination_set_ignored ##### -->
+<!-- ##### FUNCTION e_destination_import ##### -->
 <para>
 
 </para>
 
- dest: 
- ignored: 
+ str: 
+ Returns: 
 
 
-<!-- ##### FUNCTION e_destination_set_name ##### -->
+<!-- ##### FUNCTION e_destination_importv ##### -->
+<para>
+
+</para>
+
+ str: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_destination_export_to_vcard_attribute ##### -->
 <para>
 
 </para>
 
 @dest: 
- name: 
+ attr: 
 
 
-<!-- ##### FUNCTION e_destination_set_raw ##### -->
+<!-- ##### FUNCTION e_destination_freev ##### -->
+<para>
+
+</para>
+
+ destv: 
+
+
+<!-- ##### FUNCTION e_destination_set_book ##### -->
 <para>
 
 </para>
 
 @dest: 
- raw: 
+ book: 
 
 
diff --git a/docs/reference/addressbook/libebook/tmpl/e-vcard.sgml b/docs/reference/addressbook/libebook/tmpl/e-vcard.sgml
index 8ee8d34..a079f27 100644
--- a/docs/reference/addressbook/libebook/tmpl/e-vcard.sgml
+++ b/docs/reference/addressbook/libebook/tmpl/e-vcard.sgml
@@ -74,6 +74,15 @@ Does the low-level parsing work for contact information. This data is more conve
 @Returns: 
 
 
+<!-- ##### FUNCTION e_vcard_is_parsed ##### -->
+<para>
+
+</para>
+
+ evc: 
+ Returns: 
+
+
 <!-- ##### FUNCTION e_vcard_dump_structure ##### -->
 <para>
 
@@ -731,189 +740,217 @@ Blog URL
 
 
 
-<!-- ##### MACRO EVC_X_FILE_AS ##### -->
+<!-- ##### MACRO EVC_X_CALLBACK ##### -->
 <para>
-File As
+
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_GADUGADU ##### -->
+<!-- ##### MACRO EVC_X_COMPANY ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_ICQ ##### -->
+<!-- ##### MACRO EVC_X_DEST_CONTACT_UID ##### -->
 <para>
-ICQ number
+
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_JABBER ##### -->
+<!-- ##### MACRO EVC_X_DEST_EMAIL_NUM ##### -->
 <para>
-Jabber ID
+
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_LIST_SHOW_ADDRESSES ##### -->
+<!-- ##### MACRO EVC_X_DEST_HTML_MAIL ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_LIST ##### -->
+<!-- ##### MACRO EVC_X_DEST_SOURCE_UID ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_MANAGER ##### -->
+<!-- ##### MACRO EVC_X_FILE_AS ##### -->
 <para>
-Mananger
+File As
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_MSN ##### -->
+<!-- ##### MACRO EVC_X_GADUGADU ##### -->
 <para>
-MSN ID
+
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_SKYPE ##### -->
+<!-- ##### MACRO EVC_X_GROUPWISE ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_WANTS_HTML ##### -->
+<!-- ##### MACRO EVC_X_ICQ ##### -->
 <para>
-Wants HTML mail
+ICQ number
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_YAHOO ##### -->
+<!-- ##### MACRO EVC_X_JABBER ##### -->
 <para>
-Yahoo ID
+Jabber ID
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_BOOK_URI ##### -->
+<!-- ##### MACRO EVC_X_LIST_SHOW_ADDRESSES ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_CALLBACK ##### -->
+<!-- ##### MACRO EVC_X_LIST ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_COMPANY ##### -->
+<!-- ##### MACRO EVC_X_LIST_NAME ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_DEST_CONTACT_UID ##### -->
+<!-- ##### MACRO EVC_X_MANAGER ##### -->
 <para>
+Mananger
+</para>
+
+
 
+<!-- ##### MACRO EVC_X_MSN ##### -->
+<para>
+MSN ID
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_DEST_EMAIL ##### -->
+<!-- ##### MACRO EVC_X_RADIO ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_DEST_EMAIL_NUM ##### -->
+<!-- ##### MACRO EVC_X_SKYPE ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_DEST_HTML_MAIL ##### -->
+<!-- ##### MACRO EVC_X_SIP ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_DEST_NAME ##### -->
+<!-- ##### MACRO EVC_X_SPOUSE ##### -->
+<para>
+Spouse
+</para>
+
+
+
+<!-- ##### MACRO EVC_X_TELEX ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_DEST_SOURCE_UID ##### -->
+<!-- ##### MACRO EVC_X_TTYTDD ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_GROUPWISE ##### -->
+<!-- ##### MACRO EVC_X_VIDEO_URL ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_RADIO ##### -->
+<!-- ##### MACRO EVC_X_WANTS_HTML ##### -->
 <para>
+Wants HTML mail
+</para>
 
+
+
+<!-- ##### MACRO EVC_X_YAHOO ##### -->
+<para>
+Yahoo ID
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_SIP ##### -->
+<!-- ##### MACRO EVC_X_BOOK_URI ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_SPOUSE ##### -->
+<!-- ##### MACRO EVC_CONTACT_LIST ##### -->
 <para>
-Spouse
+
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_TELEX ##### -->
+<!-- ##### MACRO EVC_PARENT_CL ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_TTYTDD ##### -->
+<!-- ##### MACRO EVC_CL_UID ##### -->
 <para>
 
 </para>
 
 
 
-<!-- ##### MACRO EVC_X_VIDEO_URL ##### -->
+<!-- ##### MACRO EVC_X_DEST_EMAIL ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO EVC_X_DEST_NAME ##### -->
 <para>
 
 </para>
diff --git a/docs/reference/addressbook/libedata-book/libedata-book-docs.sgml b/docs/reference/addressbook/libedata-book/libedata-book-docs.sgml
index e3422d1..b225fcd 100644
--- a/docs/reference/addressbook/libedata-book/libedata-book-docs.sgml
+++ b/docs/reference/addressbook/libedata-book/libedata-book-docs.sgml
@@ -15,6 +15,7 @@
     <xi:include href="xml/e-book-backend-db-cache.xml"/>
     <xi:include href="xml/e-book-backend-factory.xml"/>
     <xi:include href="xml/e-book-backend-sexp.xml"/>
+    <xi:include href="xml/e-book-backend-sqlitedb.xml"/>
     <xi:include href="xml/e-book-backend-summary.xml"/>
     <xi:include href="xml/e-book-backend-sync.xml"/>
     <xi:include href="xml/e-data-book.xml"/>
diff --git a/docs/reference/addressbook/libedata-book/libedata-book-sections.txt b/docs/reference/addressbook/libedata-book/libedata-book-sections.txt
index 97336bf..d88784a 100644
--- a/docs/reference/addressbook/libedata-book/libedata-book-sections.txt
+++ b/docs/reference/addressbook/libedata-book/libedata-book-sections.txt
@@ -1,79 +1,56 @@
 <SECTION>
-<FILE>e-book-backend-sync</FILE>
-<TITLE>EBookBackendSync</TITLE>
-EBookBackendSync
-e_book_backend_sync_construct
-e_book_backend_sync_remove
-e_book_backend_sync_create_contact
-e_book_backend_sync_remove_contacts
-e_book_backend_sync_modify_contact
-e_book_backend_sync_get_contact
-e_book_backend_sync_get_contact_list
-e_book_backend_sync_get_changes
-e_book_backend_sync_authenticate_user
-e_book_backend_sync_get_required_fields
-e_book_backend_sync_get_supported_fields
-e_book_backend_sync_get_supported_auth_methods
-<SUBSECTION Standard>
-E_BOOK_BACKEND_SYNC
-E_IS_BOOK_BACKEND_SYNC
-E_TYPE_BOOK_BACKEND_SYNC
-E_BOOK_BACKEND_SYNC_CLASS
-E_IS_BOOK_BACKEND_SYNC_CLASS
-E_BOOK_BACKEND_SYNC_GET_CLASS
-EBookBackendSyncClass
-<SUBSECTION Private>
-EBookBackendSyncPrivate
-e_book_backend_sync_get_type
-</SECTION>
-
-<SECTION>
 <FILE>e-book-backend</FILE>
 <TITLE>EBookBackend</TITLE>
 EBookBackend
+CLIENT_BACKEND_PROPERTY_OPENED
+CLIENT_BACKEND_PROPERTY_OPENING
+CLIENT_BACKEND_PROPERTY_ONLINE
+CLIENT_BACKEND_PROPERTY_READONLY
+CLIENT_BACKEND_PROPERTY_CACHE_DIR
+CLIENT_BACKEND_PROPERTY_CAPABILITIES
+BOOK_BACKEND_PROPERTY_REQUIRED_FIELDS
+BOOK_BACKEND_PROPERTY_SUPPORTED_FIELDS
+BOOK_BACKEND_PROPERTY_SUPPORTED_AUTH_METHODS
 e_book_backend_get_cache_dir
 e_book_backend_set_cache_dir
-e_book_backend_load_source
 e_book_backend_get_source
 e_book_backend_add_client
 e_book_backend_remove_client
-e_book_backend_has_out_of_proc_clients
-e_book_backend_get_static_capabilities
-e_book_backend_is_loaded
-e_book_backend_is_writable
+e_book_backend_is_online
+e_book_backend_is_opened
+e_book_backend_is_opening
+e_book_backend_is_readonly
 e_book_backend_is_removed
+e_book_backend_set_online
+e_book_backend_authenticate_user
+e_book_backend_get_backend_property
+e_book_backend_set_backend_property
 e_book_backend_open
 e_book_backend_remove
+e_book_backend_refresh
 e_book_backend_create_contact
 e_book_backend_remove_contacts
 e_book_backend_modify_contact
 e_book_backend_get_contact
 e_book_backend_get_contact_list
-e_book_backend_get_changes
+e_book_backend_get_contact_list_uids
 e_book_backend_authenticate_user
-e_book_backend_get_supported_fields
-e_book_backend_get_required_fields
-e_book_backend_get_supported_auth_methods
-e_book_backend_cancel_operation
-e_book_backend_set_mode
 e_book_backend_start_book_view
 e_book_backend_stop_book_view
 e_book_backend_add_book_view
 e_book_backend_remove_book_view
-e_book_backend_get_book_views
+e_book_backend_foreach_view
 e_book_backend_notify_update
 e_book_backend_notify_remove
 e_book_backend_notify_complete
-e_book_backend_notify_writable
-e_book_backend_notify_connection_status
+e_book_backend_notify_error
+e_book_backend_notify_readonly
+e_book_backend_notify_online
 e_book_backend_notify_auth_required
+e_book_backend_notify_opened
 e_book_backend_sync
-e_book_backend_set_is_loaded
-e_book_backend_set_is_writable
 e_book_backend_set_is_removed
-e_book_backend_change_add_new
-e_book_backend_change_modify_new
-e_book_backend_change_delete_new
+e_book_backend_respond_opened
 EBookBackendClass
 <SUBSECTION Standard>
 E_BOOK_BACKEND
@@ -88,6 +65,52 @@ e_book_backend_get_type
 </SECTION>
 
 <SECTION>
+<FILE>e-book-backend-cache</FILE>
+<TITLE>EBookBackendCache</TITLE>
+EBookBackendCache
+e_book_backend_cache_new
+e_book_backend_cache_get_contact
+e_book_backend_cache_add_contact
+e_book_backend_cache_remove_contact
+e_book_backend_cache_check_contact
+e_book_backend_cache_get_contacts
+e_book_backend_cache_set_populated
+e_book_backend_cache_is_populated
+e_book_backend_cache_set_time
+e_book_backend_cache_get_time
+e_book_backend_cache_search
+<SUBSECTION Standard>
+E_BOOK_BACKEND_CACHE
+E_IS_BOOK_BACKEND_CACHE
+E_TYPE_BOOK_BACKEND_CACHE
+E_BOOK_BACKEND_CACHE_CLASS
+E_IS_BOOK_BACKEND_CACHE_CLASS
+E_BOOK_BACKEND_CACHE_GET_CLASS
+EBookBackendCacheClass
+<SUBSECTION Private>
+EBookBackendCachePrivate
+e_book_backend_cache_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-book-backend-db-cache</FILE>
+e_book_backend_db_cache_get_contact
+string_to_dbt
+e_book_backend_db_cache_get_filename
+e_book_backend_db_cache_set_filename
+e_book_backend_db_cache_add_contact
+e_book_backend_db_cache_remove_contact
+e_book_backend_db_cache_check_contact
+e_book_backend_db_cache_get_contacts
+e_book_backend_db_cache_exists
+e_book_backend_db_cache_set_populated
+e_book_backend_db_cache_is_populated
+e_book_backend_db_cache_search
+e_book_backend_db_cache_set_time
+e_book_backend_db_cache_get_time
+</SECTION>
+
+<SECTION>
 <FILE>e-book-backend-factory</FILE>
 <TITLE>EBookBackendFactory</TITLE>
 EBookBackendFactory
@@ -128,6 +151,48 @@ e_book_backend_sexp_get_type
 </SECTION>
 
 <SECTION>
+<FILE>e-book-backend-sqlitedb</FILE>
+<TITLE>EBookBackendSqliteDB</TITLE>
+EBookBackendSqliteDB
+EbSdbSearchData
+e_book_backend_sqlitedb_new
+e_book_backend_sqlitedb_add_contact
+e_book_backend_sqlitedb_add_contacts
+e_book_backend_sqlitedb_remove_contact
+e_book_backend_sqlitedb_remove_contacts
+e_book_backend_sqlitedb_has_contact
+e_book_backend_sqlitedb_get_contact
+e_book_backend_sqlitedb_get_vcard_string
+e_book_backend_sqlitedb_search
+e_book_backend_sqlitedb_search_uids
+e_book_backend_sqlitedb_get_is_populated
+e_book_backend_sqlitedb_set_is_populated
+e_book_backend_sqlitedb_get_sync_data
+e_book_backend_sqlitedb_set_sync_data
+e_book_backend_sqlitedb_get_key_value
+e_book_backend_sqlitedb_set_key_value
+e_book_backend_sqlitedb_get_contact_bdata
+e_book_backend_sqlitedb_set_contact_bdata
+e_book_backend_sqlitedb_get_has_partial_content
+e_book_backend_sqlitedb_set_has_partial_content
+e_book_backend_sqlitedb_get_partially_cached_ids
+e_book_backend_sqlitedb_delete_addressbook
+e_book_backend_sqlitedb_remove
+e_book_backend_sqlitedb_search_data_free
+<SUBSECTION Standard>
+E_TYPE_BOOK_BACKEND_SQLITEDB
+E_BOOK_BACKEND_SQLITEDB
+E_BOOK_BACKEND_SQLITEDB_CLASS
+E_IS_BOOK_BACKEND_SQLITEDB
+E_IS_BOOK_BACKEND_SQLITEDB_CLASS
+E_BOOK_BACKEND_SQLITEDB_GET_CLASS
+EBookBackendSqliteDBClass;
+e_book_backend_sqlitedb_get_type
+<SUBSECTION Private>
+EBookBackendSqliteDBPrivate
+</SECTION>
+
+<SECTION>
 <FILE>e-book-backend-summary</FILE>
 <TITLE>EBookBackendSummary</TITLE>
 EBookBackendSummary
@@ -156,31 +221,33 @@ e_book_backend_summary_get_type
 </SECTION>
 
 <SECTION>
-<FILE>e-book-backend-cache</FILE>
-<TITLE>EBookBackendCache</TITLE>
-EBookBackendCache
-e_book_backend_cache_new
-e_book_backend_cache_get_contact
-e_book_backend_cache_add_contact
-e_book_backend_cache_remove_contact
-e_book_backend_cache_check_contact
-e_book_backend_cache_get_contacts
-e_book_backend_cache_set_populated
-e_book_backend_cache_is_populated
-e_book_backend_cache_set_time
-e_book_backend_cache_get_time
-e_book_backend_cache_search
+<FILE>e-book-backend-sync</FILE>
+<TITLE>EBookBackendSync</TITLE>
+EBookBackendSync
+e_book_backend_sync_construct
+e_book_backend_sync_open
+e_book_backend_sync_remove
+e_book_backend_sync_refresh
+e_book_backend_sync_get_backend_property
+e_book_backend_sync_set_backend_property
+e_book_backend_sync_create_contact
+e_book_backend_sync_remove_contacts
+e_book_backend_sync_modify_contact
+e_book_backend_sync_get_contact
+e_book_backend_sync_get_contact_list
+e_book_backend_sync_get_contact_list_uids
+e_book_backend_sync_authenticate_user
 <SUBSECTION Standard>
-E_BOOK_BACKEND_CACHE
-E_IS_BOOK_BACKEND_CACHE
-E_TYPE_BOOK_BACKEND_CACHE
-E_BOOK_BACKEND_CACHE_CLASS
-E_IS_BOOK_BACKEND_CACHE_CLASS
-E_BOOK_BACKEND_CACHE_GET_CLASS
-EBookBackendCacheClass
+E_BOOK_BACKEND_SYNC
+E_IS_BOOK_BACKEND_SYNC
+E_TYPE_BOOK_BACKEND_SYNC
+E_BOOK_BACKEND_SYNC_CLASS
+E_IS_BOOK_BACKEND_SYNC_CLASS
+E_BOOK_BACKEND_SYNC_GET_CLASS
+EBookBackendSyncClass
 <SUBSECTION Private>
-EBookBackendCachePrivate
-e_book_backend_cache_get_type
+EBookBackendSyncPrivate
+e_book_backend_sync_get_type
 </SECTION>
 
 <SECTION>
@@ -192,25 +259,28 @@ e_data_book_create_error
 e_data_book_create_error_fmt
 e_data_book_status_to_string
 e_return_data_book_error_if_fail
+e_return_data_book_error_val_if_fail
 e_data_book_new
-e_data_book_register_gdbus_object
 e_data_book_get_backend
 e_data_book_get_source
+e_data_book_register_gdbus_object
 e_data_book_respond_open
 e_data_book_respond_remove
+e_data_book_respond_refresh
+e_data_book_respond_get_backend_property
+e_data_book_respond_set_backend_property
 e_data_book_respond_create
 e_data_book_respond_remove_contacts
 e_data_book_respond_modify
-e_data_book_respond_authenticate_user
-e_data_book_respond_get_supported_fields
-e_data_book_respond_get_required_fields
-e_data_book_respond_get_supported_auth_methods
 e_data_book_respond_get_contact
 e_data_book_respond_get_contact_list
-e_data_book_respond_get_changes
-e_data_book_report_writable
-e_data_book_report_connection_status
+e_data_book_respond_get_contact_list_uids
+e_data_book_report_error
+e_data_book_report_readonly
+e_data_book_report_online
 e_data_book_report_auth_required
+e_data_book_report_opened
+e_data_book_string_slist_to_comma_string
 <SUBSECTION Standard>
 E_DATA_BOOK
 E_IS_DATA_BOOK
@@ -237,7 +307,7 @@ e_data_book_status_get_type
 E_DATA_BOOK_FACTORY_ERROR
 EDataBookFactoryError
 EDataBookFactory
-e_data_book_factory_set_backend_mode
+e_data_book_factory_set_backend_online
 <SUBSECTION Standard>
 E_DATA_BOOK_FACTORY
 E_IS_DATA_BOOK_FACTORY
@@ -258,17 +328,15 @@ e_data_book_factory_error_quark
 EDataBookView
 e_data_book_view_new
 e_data_book_view_register_gdbus_object
-e_data_book_view_set_thresholds
 e_data_book_view_get_card_query
 e_data_book_view_get_card_sexp
-e_data_book_view_get_max_results
 e_data_book_view_get_backend
 e_data_book_view_notify_update
 e_data_book_view_notify_update_vcard
 e_data_book_view_notify_update_prefiltered_vcard
 e_data_book_view_notify_remove
 e_data_book_view_notify_complete
-e_data_book_view_notify_status_message
+e_data_book_view_notify_progress
 e_data_book_view_ref
 e_data_book_view_unref
 <SUBSECTION Standard>
@@ -289,20 +357,3 @@ e_data_book_view_get_type
 XIMIAN_VCARD
 </SECTION>
 
-<SECTION>
-<FILE>e-book-backend-db-cache</FILE>
-e_book_backend_db_cache_get_contact
-string_to_dbt
-e_book_backend_db_cache_get_filename
-e_book_backend_db_cache_set_filename
-e_book_backend_db_cache_add_contact
-e_book_backend_db_cache_remove_contact
-e_book_backend_db_cache_check_contact
-e_book_backend_db_cache_get_contacts
-e_book_backend_db_cache_exists
-e_book_backend_db_cache_set_populated
-e_book_backend_db_cache_is_populated
-e_book_backend_db_cache_search
-e_book_backend_db_cache_set_time
-e_book_backend_db_cache_get_time
-</SECTION>
diff --git a/docs/reference/addressbook/libedata-book/tmpl/e-book-backend-sqlitedb.sgml b/docs/reference/addressbook/libedata-book/tmpl/e-book-backend-sqlitedb.sgml
new file mode 100644
index 0000000..4c1af0a
--- /dev/null
+++ b/docs/reference/addressbook/libedata-book/tmpl/e-book-backend-sqlitedb.sgml
@@ -0,0 +1,324 @@
+<!-- ##### SECTION Title ##### -->
+EBookBackendSqliteDB
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT EBookBackendSqliteDB ##### -->
+<para>
+
+</para>
+
+ parent: 
+ priv: 
+
+<!-- ##### STRUCT EbSdbSearchData ##### -->
+<para>
+
+</para>
+
+ vcard: 
+ uid: 
+ bdata: 
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_new ##### -->
+<para>
+
+</para>
+
+ path: 
+ email_id: 
+ folderid: 
+ folder_name: 
+ store_vcard: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_add_contact ##### -->
+<para>
+
+</para>
+
+ ebsdb: 
+ folderid: 
+ contact: 
+ partial_content: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_add_contacts ##### -->
+<para>
+
+</para>
+
+ ebsdb: 
+ folderid: 
+ contacts: 
+ partial_content: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_remove_contact ##### -->
+<para>
+
+</para>
+
+ ebsdb: 
+ folderid: 
+ uid: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_remove_contacts ##### -->
+<para>
+
+</para>
+
+ ebsdb: 
+ folderid: 
+ uids: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_has_contact ##### -->
+<para>
+
+</para>
+
+ ebsdb: 
+ folderid: 
+ uid: 
+ partial_content: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_get_contact ##### -->
+<para>
+
+</para>
+
+ ebsdb: 
+ folderid: 
+ uid: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_get_vcard_string ##### -->
+<para>
+
+</para>
+
+ ebsdb: 
+ folderid: 
+ uid: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_search ##### -->
+<para>
+
+</para>
+
+ ebsdb: 
+ folderid: 
+ sexp: 
+ fields_of_interest: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_search_uids ##### -->
+<para>
+
+</para>
+
+ ebsdb: 
+ folderid: 
+ sexp: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_get_is_populated ##### -->
+<para>
+
+</para>
+
+ ebsdb: 
+ folderid: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_set_is_populated ##### -->
+<para>
+
+</para>
+
+ ebsdb: 
+ folderid: 
+ populated: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_get_sync_data ##### -->
+<para>
+
+</para>
+
+ ebsdb: 
+ folderid: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_set_sync_data ##### -->
+<para>
+
+</para>
+
+ ebsdb: 
+ folderid: 
+ sync_data: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_get_key_value ##### -->
+<para>
+
+</para>
+
+ ebsdb: 
+ folderid: 
+ key: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_set_key_value ##### -->
+<para>
+
+</para>
+
+ ebsdb: 
+ folderid: 
+ key: 
+ value: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_get_contact_bdata ##### -->
+<para>
+
+</para>
+
+ ebsdb: 
+ folderid: 
+ uid: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_set_contact_bdata ##### -->
+<para>
+
+</para>
+
+ ebsdb: 
+ folderid: 
+ uid: 
+ value: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_get_has_partial_content ##### -->
+<para>
+
+</para>
+
+ ebsdb: 
+ folderid: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_set_has_partial_content ##### -->
+<para>
+
+</para>
+
+ ebsdb: 
+ folderid: 
+ partial_content: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_get_partially_cached_ids ##### -->
+<para>
+
+</para>
+
+ ebsdb: 
+ folderid: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_delete_addressbook ##### -->
+<para>
+
+</para>
+
+ ebsdb: 
+ folderid: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_remove ##### -->
+<para>
+
+</para>
+
+ ebsdb: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sqlitedb_search_data_free ##### -->
+<para>
+
+</para>
+
+ s_data: 
+
+
diff --git a/docs/reference/addressbook/libedata-book/tmpl/e-book-backend-sync.sgml b/docs/reference/addressbook/libedata-book/tmpl/e-book-backend-sync.sgml
index cd4e709..c536c03 100644
--- a/docs/reference/addressbook/libedata-book/tmpl/e-book-backend-sync.sgml
+++ b/docs/reference/addressbook/libedata-book/tmpl/e-book-backend-sync.sgml
@@ -35,6 +35,18 @@ EBookBackendSync
 @Returns: 
 
 
+<!-- ##### FUNCTION e_book_backend_sync_open ##### -->
+<para>
+
+</para>
+
+ backend: 
+ book: 
+ cancellable: 
+ only_if_exists: 
+ error: 
+
+
 <!-- ##### FUNCTION e_book_backend_sync_remove ##### -->
 <para>
 
@@ -46,6 +58,45 @@ EBookBackendSync
 @error: 
 
 
+<!-- ##### FUNCTION e_book_backend_sync_refresh ##### -->
+<para>
+
+</para>
+
+ backend: 
+ book: 
+ cancellable: 
+ error: 
+
+
+<!-- ##### FUNCTION e_book_backend_sync_get_backend_property ##### -->
+<para>
+
+</para>
+
+ backend: 
+ book: 
+ cancellable: 
+ prop_name: 
+ prop_value: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_sync_set_backend_property ##### -->
+<para>
+
+</para>
+
+ backend: 
+ book: 
+ cancellable: 
+ prop_name: 
+ prop_value: 
+ error: 
+ Returns: 
+
+
 <!-- ##### FUNCTION e_book_backend_sync_create_contact ##### -->
 <para>
 
@@ -111,6 +162,19 @@ EBookBackendSync
 @error: 
 
 
+<!-- ##### FUNCTION e_book_backend_sync_get_contact_list_uids ##### -->
+<para>
+
+</para>
+
+ backend: 
+ book: 
+ cancellable: 
+ query: 
+ contacts_uids: 
+ error: 
+
+
 <!-- ##### FUNCTION e_book_backend_sync_authenticate_user ##### -->
 <para>
 
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 14819de..67436fd 100644
--- a/docs/reference/addressbook/libedata-book/tmpl/e-book-backend.sgml
+++ b/docs/reference/addressbook/libedata-book/tmpl/e-book-backend.sgml
@@ -38,6 +38,69 @@ EBookBackend
 
 </para>
 
+<!-- ##### MACRO CLIENT_BACKEND_PROPERTY_OPENED ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CLIENT_BACKEND_PROPERTY_OPENING ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CLIENT_BACKEND_PROPERTY_ONLINE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CLIENT_BACKEND_PROPERTY_READONLY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CLIENT_BACKEND_PROPERTY_CACHE_DIR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CLIENT_BACKEND_PROPERTY_CAPABILITIES ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO BOOK_BACKEND_PROPERTY_REQUIRED_FIELDS ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO BOOK_BACKEND_PROPERTY_SUPPORTED_FIELDS ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO BOOK_BACKEND_PROPERTY_SUPPORTED_AUTH_METHODS ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### FUNCTION e_book_backend_get_cache_dir ##### -->
 <para>
 
@@ -84,6 +147,42 @@ EBookBackend
 @book: 
 
 
+<!-- ##### FUNCTION e_book_backend_is_online ##### -->
+<para>
+
+</para>
+
+ backend: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_is_opened ##### -->
+<para>
+
+</para>
+
+ backend: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_is_opening ##### -->
+<para>
+
+</para>
+
+ backend: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_book_backend_is_readonly ##### -->
+<para>
+
+</para>
+
+ backend: 
+ Returns: 
+
+
 <!-- ##### FUNCTION e_book_backend_is_removed ##### -->
 <para>
 
@@ -93,6 +192,50 @@ EBookBackend
 @Returns: 
 
 
+<!-- ##### FUNCTION e_book_backend_set_online ##### -->
+<para>
+
+</para>
+
+ backend: 
+ is_online: 
+
+
+<!-- ##### FUNCTION e_book_backend_authenticate_user ##### -->
+<para>
+
+</para>
+
+ backend: 
+ cancellable: 
+ credentials: 
+
+
+<!-- ##### FUNCTION e_book_backend_get_backend_property ##### -->
+<para>
+
+</para>
+
+ backend: 
+ book: 
+ opid: 
+ cancellable: 
+ prop_name: 
+
+
+<!-- ##### FUNCTION e_book_backend_set_backend_property ##### -->
+<para>
+
+</para>
+
+ backend: 
+ book: 
+ opid: 
+ cancellable: 
+ prop_name: 
+ prop_value: 
+
+
 <!-- ##### FUNCTION e_book_backend_open ##### -->
 <para>
 
@@ -116,6 +259,17 @@ EBookBackend
 @cancellable: 
 
 
+<!-- ##### FUNCTION e_book_backend_refresh ##### -->
+<para>
+
+</para>
+
+ backend: 
+ book: 
+ opid: 
+ cancellable: 
+
+
 <!-- ##### FUNCTION e_book_backend_create_contact ##### -->
 <para>
 
@@ -176,6 +330,18 @@ EBookBackend
 @query: 
 
 
+<!-- ##### FUNCTION e_book_backend_get_contact_list_uids ##### -->
+<para>
+
+</para>
+
+ backend: 
+ book: 
+ opid: 
+ cancellable: 
+ query: 
+
+
 <!-- ##### FUNCTION e_book_backend_authenticate_user ##### -->
 <para>
 
@@ -222,6 +388,22 @@ EBookBackend
 @view: 
 
 
+<!-- ##### FUNCTION e_book_backend_foreach_view ##### -->
+<para>
+
+</para>
+
+ backend: 
+ 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:
+ EDataBookView *view, gpointer user_data:
+ EDataBookView *view, gpointer user_data: 
+ user_data: 
+
+
 <!-- ##### FUNCTION e_book_backend_notify_update ##### -->
 <para>
 
@@ -248,6 +430,33 @@ EBookBackend
 @backend: 
 
 
+<!-- ##### FUNCTION e_book_backend_notify_error ##### -->
+<para>
+
+</para>
+
+ backend: 
+ message: 
+
+
+<!-- ##### FUNCTION e_book_backend_notify_readonly ##### -->
+<para>
+
+</para>
+
+ backend: 
+ is_readonly: 
+
+
+<!-- ##### FUNCTION e_book_backend_notify_online ##### -->
+<para>
+
+</para>
+
+ backend: 
+ is_online: 
+
+
 <!-- ##### FUNCTION e_book_backend_notify_auth_required ##### -->
 <para>
 
@@ -258,6 +467,15 @@ EBookBackend
 @credentials: 
 
 
+<!-- ##### FUNCTION e_book_backend_notify_opened ##### -->
+<para>
+
+</para>
+
+ backend: 
+ error: 
+
+
 <!-- ##### FUNCTION e_book_backend_sync ##### -->
 <para>
 
@@ -275,6 +493,17 @@ EBookBackend
 @is_removed: 
 
 
+<!-- ##### FUNCTION e_book_backend_respond_opened ##### -->
+<para>
+
+</para>
+
+ backend: 
+ book: 
+ opid: 
+ error: 
+
+
 <!-- ##### STRUCT EBookBackendClass ##### -->
 <para>
 
diff --git a/docs/reference/addressbook/libedata-book/tmpl/e-data-book-factory.sgml b/docs/reference/addressbook/libedata-book/tmpl/e-data-book-factory.sgml
index 011fc0b..f490ab3 100644
--- a/docs/reference/addressbook/libedata-book/tmpl/e-data-book-factory.sgml
+++ b/docs/reference/addressbook/libedata-book/tmpl/e-data-book-factory.sgml
@@ -42,3 +42,12 @@ EDataBookFactory
 @parent: 
 @priv: 
 
+<!-- ##### FUNCTION e_data_book_factory_set_backend_online ##### -->
+<para>
+
+</para>
+
+ factory: 
+ is_online: 
+
+
diff --git a/docs/reference/addressbook/libedata-book/tmpl/e-data-book-view.sgml b/docs/reference/addressbook/libedata-book/tmpl/e-data-book-view.sgml
index 9d8d109..cebea05 100644
--- a/docs/reference/addressbook/libedata-book/tmpl/e-data-book-view.sgml
+++ b/docs/reference/addressbook/libedata-book/tmpl/e-data-book-view.sgml
@@ -122,6 +122,16 @@ EDataBookView
 @error: 
 
 
+<!-- ##### FUNCTION e_data_book_view_notify_progress ##### -->
+<para>
+
+</para>
+
+ book_view: 
+ percent: 
+ message: 
+
+
 <!-- ##### FUNCTION e_data_book_view_ref ##### -->
 <para>
 
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 c944612..90d65f6 100644
--- a/docs/reference/addressbook/libedata-book/tmpl/e-data-book.sgml
+++ b/docs/reference/addressbook/libedata-book/tmpl/e-data-book.sgml
@@ -72,6 +72,15 @@ EDataBook
 @_code: 
 
 
+<!-- ##### MACRO e_return_data_book_error_val_if_fail ##### -->
+<para>
+
+</para>
+
+ expr: 
+ _code: 
+
+
 <!-- ##### FUNCTION e_data_book_new ##### -->
 <para>
 
@@ -82,6 +91,24 @@ EDataBook
 @Returns: 
 
 
+<!-- ##### FUNCTION e_data_book_get_backend ##### -->
+<para>
+
+</para>
+
+ book: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_data_book_get_source ##### -->
+<para>
+
+</para>
+
+ book: 
+ Returns: 
+
+
 <!-- ##### FUNCTION e_data_book_register_gdbus_object ##### -->
 <para>
 
@@ -94,25 +121,27 @@ EDataBook
 @Returns: 
 
 
-<!-- ##### FUNCTION e_data_book_get_backend ##### -->
+<!-- ##### FUNCTION e_data_book_respond_open ##### -->
 <para>
 
 </para>
 
 @book: 
- Returns: 
+ opid: 
+ error: 
 
 
-<!-- ##### FUNCTION e_data_book_get_source ##### -->
+<!-- ##### FUNCTION e_data_book_respond_remove ##### -->
 <para>
 
 </para>
 
 @book: 
- Returns: 
+ opid: 
+ error: 
 
 
-<!-- ##### FUNCTION e_data_book_respond_open ##### -->
+<!-- ##### FUNCTION e_data_book_respond_refresh ##### -->
 <para>
 
 </para>
@@ -122,7 +151,18 @@ EDataBook
 @error: 
 
 
-<!-- ##### FUNCTION e_data_book_respond_remove ##### -->
+<!-- ##### FUNCTION e_data_book_respond_get_backend_property ##### -->
+<para>
+
+</para>
+
+ book: 
+ opid: 
+ error: 
+ prop_value: 
+
+
+<!-- ##### FUNCTION e_data_book_respond_set_backend_property ##### -->
 <para>
 
 </para>
@@ -187,6 +227,44 @@ EDataBook
 @cards: 
 
 
+<!-- ##### FUNCTION e_data_book_respond_get_contact_list_uids ##### -->
+<para>
+
+</para>
+
+ book: 
+ opid: 
+ error: 
+ uids: 
+
+
+<!-- ##### FUNCTION e_data_book_report_error ##### -->
+<para>
+
+</para>
+
+ book: 
+ message: 
+
+
+<!-- ##### FUNCTION e_data_book_report_readonly ##### -->
+<para>
+
+</para>
+
+ book: 
+ readonly: 
+
+
+<!-- ##### FUNCTION e_data_book_report_online ##### -->
+<para>
+
+</para>
+
+ book: 
+ is_online: 
+
+
 <!-- ##### FUNCTION e_data_book_report_auth_required ##### -->
 <para>
 
@@ -196,3 +274,21 @@ EDataBook
 @credentials: 
 
 
+<!-- ##### FUNCTION e_data_book_report_opened ##### -->
+<para>
+
+</para>
+
+ book: 
+ error: 
+
+
+<!-- ##### FUNCTION e_data_book_string_slist_to_comma_string ##### -->
+<para>
+
+</para>
+
+ strings: 
+ Returns: 
+
+
diff --git a/docs/reference/calendar/libecal/libecal-docs.sgml b/docs/reference/calendar/libecal/libecal-docs.sgml
index e15bb54..0a22843 100644
--- a/docs/reference/calendar/libecal/libecal-docs.sgml
+++ b/docs/reference/calendar/libecal/libecal-docs.sgml
@@ -10,9 +10,9 @@
 
   <chapter>
     <title>Evolution-Data-Server Manual: Calendar Client (libecal)</title>
-    <xi:include href="xml/e-cal.xml"/>
+    <xi:include href="xml/e-cal-client.xml"/>
+    <xi:include href="xml/e-cal-client-view.xml"/>
     <xi:include href="xml/e-cal-component.xml"/>
-    <xi:include href="xml/e-cal-view.xml"/>
     <xi:include href="xml/e-cal-recur.xml"/>
     <xi:include href="xml/e-cal-time-util.xml"/>
     <xi:include href="xml/e-cal-types.xml"/>
@@ -21,6 +21,12 @@
     <xi:include href="xml/e-cal-check-timezones.xml"/>
   </chapter>
 
+  <chapter>
+    <title>Deprecated Classes</title>
+    <xi:include href="xml/e-cal.xml"/>
+    <xi:include href="xml/e-cal-view.xml"/>
+  </chapter>
+
   <index id="api-index-full">
     <title>Index</title>
     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
diff --git a/docs/reference/calendar/libecal/libecal-sections.txt b/docs/reference/calendar/libecal/libecal-sections.txt
index 77f88b4..e7e1cb7 100644
--- a/docs/reference/calendar/libecal/libecal-sections.txt
+++ b/docs/reference/calendar/libecal/libecal-sections.txt
@@ -1,4 +1,222 @@
 <SECTION>
+<FILE>e-cal</FILE>
+<TITLE>ECal</TITLE>
+ECal
+ECalSourceType
+ECalSetModeStatus
+ECalLoadState
+EDataCalMode
+ECalAuthFunc
+e_cal_new
+e_cal_new_from_uri
+e_cal_new_system_calendar
+e_cal_new_system_tasks
+e_cal_new_system_memos
+e_cal_set_auth_func
+e_cal_open
+e_cal_open_async
+e_cal_refresh
+e_cal_remove
+e_cal_uri_list
+e_cal_get_source_type
+e_cal_get_load_state
+e_cal_get_source
+e_cal_get_uri
+e_cal_is_read_only
+e_cal_get_cal_address
+e_cal_get_alarm_email_address
+e_cal_get_ldap_attribute
+e_cal_get_one_alarm_only
+e_cal_get_organizer_must_attend
+e_cal_get_save_schedules
+e_cal_get_static_capability
+e_cal_get_organizer_must_accept
+e_cal_get_refresh_supported
+e_cal_set_mode
+e_cal_get_default_object
+e_cal_get_object
+e_cal_get_objects_for_uid
+e_cal_get_changes
+e_cal_free_change_list
+e_cal_get_object_list
+e_cal_get_object_list_as_comp
+e_cal_free_object_list
+e_cal_get_free_busy
+e_cal_generate_instances
+e_cal_generate_instances_for_object
+e_cal_get_alarms_in_range
+e_cal_free_alarms
+e_cal_get_alarms_for_object
+e_cal_create_object
+e_cal_modify_object
+e_cal_remove_object
+e_cal_remove_object_with_mod
+e_cal_discard_alarm
+e_cal_receive_objects
+e_cal_send_objects
+e_cal_get_timezone
+e_cal_add_timezone
+e_cal_set_default_timezone
+e_cal_get_query
+e_cal_resolve_tzid_cb
+e_cal_get_component_as_string
+e_cal_get_error_message
+e_cal_open_default
+e_cal_set_default
+e_cal_set_default_source
+e_cal_get_sources
+e_cal_get_local_attachment_store
+e_cal_get_recurrences_no_master
+e_cal_get_attachments_for_comp
+<SUBSECTION Standard>
+E_CAL
+E_IS_CAL
+E_TYPE_CAL
+E_CAL_CLASS
+E_IS_CAL_CLASS
+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
+</SECTION>
+
+<SECTION>
+<FILE>e-cal-check-timezones</FILE>
+e_cal_client_check_timezones
+e_cal_client_tzlookup
+e_cal_client_tzlookup_icomp
+e_cal_match_tzid
+e_cal_check_timezones
+e_cal_tzlookup_ecal
+e_cal_tzlookup_icomp
+</SECTION>
+
+<SECTION>
+<FILE>e-cal-client</FILE>
+<TITLE>ECalClient</TITLE>
+ECalClient
+CAL_BACKEND_PROPERTY_CAL_EMAIL_ADDRESS
+CAL_BACKEND_PROPERTY_ALARM_EMAIL_ADDRESS
+CAL_BACKEND_PROPERTY_DEFAULT_OBJECT
+ECalClientSourceType
+E_CAL_CLIENT_ERROR
+ECalClientError
+e_cal_client_error_to_string
+e_cal_client_error_create
+e_cal_client_new
+e_cal_client_new_from_uri
+e_cal_client_new_system
+e_cal_client_new_default
+e_cal_client_set_default
+e_cal_client_set_default_source
+e_cal_client_get_sources
+e_cal_client_get_source_type
+e_cal_client_get_local_attachment_store
+e_cal_client_set_default_timezone
+e_cal_client_get_default_timezone
+e_cal_client_check_one_alarm_only
+e_cal_client_check_save_schedules
+e_cal_client_check_organizer_must_attend
+e_cal_client_check_organizer_must_accept
+e_cal_client_check_recurrences_no_master
+e_cal_client_free_icalcomp_slist
+e_cal_client_free_ecalcomp_slist
+e_cal_client_resolve_tzid_cb
+e_cal_client_generate_instances
+e_cal_client_generate_instances_for_object
+e_cal_client_get_component_as_string
+e_cal_client_get_default_object
+e_cal_client_get_default_object_finish
+e_cal_client_get_default_object_sync
+e_cal_client_get_object
+e_cal_client_get_object_finish
+e_cal_client_get_object_sync
+e_cal_client_get_objects_for_uid
+e_cal_client_get_objects_for_uid_finish
+e_cal_client_get_objects_for_uid_sync
+e_cal_client_get_object_list
+e_cal_client_get_object_list_finish
+e_cal_client_get_object_list_sync
+e_cal_client_get_object_list_as_comps
+e_cal_client_get_object_list_as_comps_finish
+e_cal_client_get_object_list_as_comps_sync
+e_cal_client_get_free_busy
+e_cal_client_get_free_busy_finish
+e_cal_client_get_free_busy_sync
+e_cal_client_create_object
+e_cal_client_create_object_finish
+e_cal_client_create_object_sync
+e_cal_client_modify_object
+e_cal_client_modify_object_finish
+e_cal_client_modify_object_sync
+e_cal_client_remove_object
+e_cal_client_remove_object_finish
+e_cal_client_remove_object_sync
+e_cal_client_receive_objects
+e_cal_client_receive_objects_finish
+e_cal_client_receive_objects_sync
+e_cal_client_send_objects
+e_cal_client_send_objects_finish
+e_cal_client_send_objects_sync
+e_cal_client_get_attachment_uris
+e_cal_client_get_attachment_uris_finish
+e_cal_client_get_attachment_uris_sync
+e_cal_client_discard_alarm
+e_cal_client_discard_alarm_finish
+e_cal_client_discard_alarm_sync
+e_cal_client_get_view
+e_cal_client_get_view_finish
+e_cal_client_get_view_sync
+e_cal_client_get_timezone
+e_cal_client_get_timezone_finish
+e_cal_client_get_timezone_sync
+e_cal_client_add_timezone
+e_cal_client_add_timezone_finish
+e_cal_client_add_timezone_sync
+<SUBSECTION Standard>
+E_CAL_CLIENT
+E_IS_CAL_CLIENT
+E_TYPE_CAL_CLIENT
+E_CAL_CLIENT_CLASS
+E_IS_CAL_CLIENT_CLASS
+E_CAL_CLIENT_GET_CLASS
+ECalClientClass
+e_cal_client_get_type
+e_cal_client_source_type_enum_get_type
+<SUBSECTION Private>
+ECalClientPrivate
+e_cal_client_error_quark
+</SECTION>
+
+<SECTION>
+<FILE>e-cal-client-view</FILE>
+<TITLE>ECalClientView</TITLE>
+ECalClientView
+e_cal_client_view_get_client
+e_cal_client_view_is_running
+e_cal_client_view_set_fields_of_interest
+e_cal_client_view_start
+e_cal_client_view_stop
+<SUBSECTION Standard>
+E_CAL_CLIENT_VIEW
+E_IS_CAL_CLIENT_VIEW
+E_TYPE_CAL_CLIENT_VIEW
+E_CAL_CLIENT_VIEW_CLASS
+E_IS_CAL_CLIENT_VIEW_CLASS
+E_CAL_CLIENT_VIEW_GET_CLASS
+ECalClientViewClass
+e_cal_client_view_get_type
+<SUBSECTION Private>
+ECalClientViewPrivate
+</SECTION>
+
+<SECTION>
 <FILE>e-cal-component</FILE>
 <TITLE>ECalComponent</TITLE>
 ECalComponent
@@ -168,93 +386,6 @@ e_cal_component_get_type
 </SECTION>
 
 <SECTION>
-<FILE>e-cal</FILE>
-<TITLE>ECal</TITLE>
-ECal
-ECalSourceType
-ECalSetModeStatus
-ECalLoadState
-ECalAuthFunc
-e_cal_new
-e_cal_new_from_uri
-e_cal_new_system_calendar
-e_cal_new_system_tasks
-e_cal_new_system_memos
-e_cal_set_auth_func
-e_cal_open
-e_cal_open_async
-e_cal_refresh
-e_cal_remove
-e_cal_uri_list
-e_cal_get_source_type
-e_cal_get_load_state
-e_cal_get_source
-e_cal_get_uri
-e_cal_is_read_only
-e_cal_get_cal_address
-e_cal_get_alarm_email_address
-e_cal_get_ldap_attribute
-e_cal_get_one_alarm_only
-e_cal_get_organizer_must_attend
-e_cal_get_save_schedules
-e_cal_get_static_capability
-e_cal_get_organizer_must_accept
-e_cal_get_refresh_supported
-e_cal_set_mode
-e_cal_get_default_object
-e_cal_get_object
-e_cal_get_objects_for_uid
-e_cal_get_changes
-e_cal_free_change_list
-e_cal_get_object_list
-e_cal_get_object_list_as_comp
-e_cal_free_object_list
-e_cal_get_free_busy
-e_cal_generate_instances
-e_cal_generate_instances_for_object
-e_cal_get_alarms_in_range
-e_cal_free_alarms
-e_cal_get_alarms_for_object
-e_cal_create_object
-e_cal_modify_object
-e_cal_remove_object
-e_cal_remove_object_with_mod
-e_cal_discard_alarm
-e_cal_receive_objects
-e_cal_send_objects
-e_cal_get_timezone
-e_cal_add_timezone
-e_cal_set_default_timezone
-e_cal_get_query
-e_cal_resolve_tzid_cb
-e_cal_get_component_as_string
-e_cal_get_error_message
-e_cal_open_default
-e_cal_set_default
-e_cal_set_default_source
-e_cal_get_sources
-e_cal_get_local_attachment_store
-e_cal_get_recurrences_no_master
-e_cal_get_attachments_for_comp
-<SUBSECTION Standard>
-E_CAL
-E_IS_CAL
-E_TYPE_CAL
-E_CAL_CLASS
-E_IS_CAL_CLASS
-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
-</SECTION>
-
-<SECTION>
 <FILE>e-cal-recur</FILE>
 ECalRecurInstanceFn
 ECalRecurResolveTimezoneFn
@@ -266,6 +397,11 @@ e_cal_recur_nth
 </SECTION>
 
 <SECTION>
+<FILE>e-cal-system-timezone</FILE>
+e_cal_system_timezone_get_location
+</SECTION>
+
+<SECTION>
 <FILE>e-cal-time-util</FILE>
 time_days_in_month
 time_day_of_year
@@ -302,11 +438,6 @@ E_CALENDAR_STATUS_CORBA_EXCEPTION
 </SECTION>
 
 <SECTION>
-<FILE>e-cal-system-timezone</FILE>
-e_cal_system_timezone_get_location
-</SECTION>
-
-<SECTION>
 <FILE>e-cal-util</FILE>
 CalObjInstance
 cal_obj_instance_list_free
@@ -340,6 +471,7 @@ CAL_STATIC_CAPABILITY_NO_TASK_ASSIGNMENT
 CAL_STATIC_CAPABILITY_NO_THISANDFUTURE
 CAL_STATIC_CAPABILITY_NO_THISANDPRIOR
 CAL_STATIC_CAPABILITY_NO_TRANSPARENCY
+CAL_STATIC_CAPABILITY_REMOVE_ONLY_THIS
 CAL_STATIC_CAPABILITY_ONE_ALARM_ONLY
 CAL_STATIC_CAPABILITY_ORGANIZER_MUST_ATTEND
 CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS
@@ -384,10 +516,3 @@ e_cal_view_get_type
 e_cal_view_new
 </SECTION>
 
-<SECTION>
-<FILE>e-cal-check-timezones</FILE>
-e_cal_check_timezones
-e_cal_tzlookup_ecal
-e_cal_tzlookup_icomp
-e_cal_match_tzid
-</SECTION>
diff --git a/docs/reference/calendar/libecal/libecal.types b/docs/reference/calendar/libecal/libecal.types
index 1286092..62b32cc 100644
--- a/docs/reference/calendar/libecal/libecal.types
+++ b/docs/reference/calendar/libecal/libecal.types
@@ -1,7 +1,11 @@
 #include <libecal/e-cal.h>
+#include <libecal/e-cal-client.h>
+#include <libecal/e-cal-client-view.h>
 #include <libecal/e-cal-component.h>
 #include <libecal/e-cal-view.h>
 
 e_cal_get_type
+e_cal_client_get_type
+e_cal_client_view_get_type
 e_cal_component_get_type
 e_cal_view_get_type
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 992d5e7..0c27db2 100644
--- a/docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml
+++ b/docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml
@@ -20,6 +20,56 @@ e-cal-check-timezones
 <!-- ##### SECTION Image ##### -->
 
 
+<!-- ##### FUNCTION e_cal_client_check_timezones ##### -->
+<para>
+
+</para>
+
+ comp: 
+ comps: 
+ 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: 
+ ecalclient: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_tzlookup ##### -->
+<para>
+
+</para>
+
+ tzid: 
+ ecalclient: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_tzlookup_icomp ##### -->
+<para>
+
+</para>
+
+ tzid: 
+ custom: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_match_tzid ##### -->
+<para>
+
+</para>
+
+ tzid: 
+ Returns: 
+
+
 <!-- ##### FUNCTION e_cal_check_timezones ##### -->
 <para>
 
@@ -69,6 +119,16 @@ 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:
+ 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:
+ 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: 
@@ -97,12 +157,3 @@ e-cal-check-timezones
 @Returns: 
 
 
-<!-- ##### FUNCTION e_cal_match_tzid ##### -->
-<para>
-
-</para>
-
- tzid: 
- Returns: 
-
-
diff --git a/docs/reference/calendar/libecal/tmpl/e-cal-client-view.sgml b/docs/reference/calendar/libecal/tmpl/e-cal-client-view.sgml
new file mode 100644
index 0000000..aab9728
--- /dev/null
+++ b/docs/reference/calendar/libecal/tmpl/e-cal-client-view.sgml
@@ -0,0 +1,125 @@
+<!-- ##### SECTION Title ##### -->
+ECalClientView
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT ECalClientView ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SIGNAL ECalClientView::complete ##### -->
+<para>
+
+</para>
+
+ ecalclientview: the object which received the signal.
+ arg1: 
+
+<!-- ##### SIGNAL ECalClientView::objects-added ##### -->
+<para>
+
+</para>
+
+ ecalclientview: the object which received the signal.
+ arg1: 
+
+<!-- ##### SIGNAL ECalClientView::objects-modified ##### -->
+<para>
+
+</para>
+
+ ecalclientview: the object which received the signal.
+ arg1: 
+
+<!-- ##### SIGNAL ECalClientView::objects-removed ##### -->
+<para>
+
+</para>
+
+ ecalclientview: the object which received the signal.
+ arg1: 
+
+<!-- ##### SIGNAL ECalClientView::progress ##### -->
+<para>
+
+</para>
+
+ ecalclientview: the object which received the signal.
+ arg1: 
+ arg2: 
+
+<!-- ##### ARG ECalClientView:client ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG ECalClientView:view ##### -->
+<para>
+
+</para>
+
+<!-- ##### FUNCTION e_cal_client_view_get_client ##### -->
+<para>
+
+</para>
+
+ view: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_view_is_running ##### -->
+<para>
+
+</para>
+
+ view: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_view_set_fields_of_interest ##### -->
+<para>
+
+</para>
+
+ view: 
+ fields_of_interest: 
+ error: 
+
+
+<!-- ##### FUNCTION e_cal_client_view_start ##### -->
+<para>
+
+</para>
+
+ view: 
+ error: 
+
+
+<!-- ##### FUNCTION e_cal_client_view_stop ##### -->
+<para>
+
+</para>
+
+ view: 
+ error: 
+
+
diff --git a/docs/reference/calendar/libecal/tmpl/e-cal-client.sgml b/docs/reference/calendar/libecal/tmpl/e-cal-client.sgml
new file mode 100644
index 0000000..13aa8d8
--- /dev/null
+++ b/docs/reference/calendar/libecal/tmpl/e-cal-client.sgml
@@ -0,0 +1,919 @@
+<!-- ##### SECTION Title ##### -->
+ECalClient
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT ECalClient ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SIGNAL ECalClient::free-busy-data ##### -->
+<para>
+
+</para>
+
+ ecalclient: the object which received the signal.
+ arg1: 
+
+<!-- ##### MACRO CAL_BACKEND_PROPERTY_CAL_EMAIL_ADDRESS ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CAL_BACKEND_PROPERTY_ALARM_EMAIL_ADDRESS ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CAL_BACKEND_PROPERTY_DEFAULT_OBJECT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### ENUM ECalClientSourceType ##### -->
+<para>
+
+</para>
+
+ E_CAL_CLIENT_SOURCE_TYPE_EVENTS: 
+ E_CAL_CLIENT_SOURCE_TYPE_TASKS: 
+ E_CAL_CLIENT_SOURCE_TYPE_MEMOS: 
+ E_CAL_CLIENT_SOURCE_TYPE_LAST: 
+
+<!-- ##### MACRO E_CAL_CLIENT_ERROR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### ENUM ECalClientError ##### -->
+<para>
+
+</para>
+
+ E_CAL_CLIENT_ERROR_NO_SUCH_CALENDAR: 
+ E_CAL_CLIENT_ERROR_OBJECT_NOT_FOUND: 
+ E_CAL_CLIENT_ERROR_INVALID_OBJECT: 
+ E_CAL_CLIENT_ERROR_UNKNOWN_USER: 
+ E_CAL_CLIENT_ERROR_OBJECT_ID_ALREADY_EXISTS: 
+ E_CAL_CLIENT_ERROR_INVALID_RANGE: 
+
+<!-- ##### FUNCTION e_cal_client_error_to_string ##### -->
+<para>
+
+</para>
+
+ code: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_error_create ##### -->
+<para>
+
+</para>
+
+ code: 
+ custom_msg: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_new ##### -->
+<para>
+
+</para>
+
+ source: 
+ source_type: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_new_from_uri ##### -->
+<para>
+
+</para>
+
+ uri: 
+ source_type: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_new_system ##### -->
+<para>
+
+</para>
+
+ source_type: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_new_default ##### -->
+<para>
+
+</para>
+
+ source_type: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_set_default ##### -->
+<para>
+
+</para>
+
+ client: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_set_default_source ##### -->
+<para>
+
+</para>
+
+ source: 
+ source_type: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_sources ##### -->
+<para>
+
+</para>
+
+ sources: 
+ source_type: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_source_type ##### -->
+<para>
+
+</para>
+
+ client: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_local_attachment_store ##### -->
+<para>
+
+</para>
+
+ client: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_set_default_timezone ##### -->
+<para>
+
+</para>
+
+ client: 
+ zone: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_default_timezone ##### -->
+<para>
+
+</para>
+
+ client: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_check_one_alarm_only ##### -->
+<para>
+
+</para>
+
+ client: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_check_save_schedules ##### -->
+<para>
+
+</para>
+
+ client: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_check_organizer_must_attend ##### -->
+<para>
+
+</para>
+
+ client: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_check_organizer_must_accept ##### -->
+<para>
+
+</para>
+
+ client: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_check_recurrences_no_master ##### -->
+<para>
+
+</para>
+
+ client: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_free_icalcomp_slist ##### -->
+<para>
+
+</para>
+
+ icalcomps: 
+
+
+<!-- ##### FUNCTION e_cal_client_free_ecalcomp_slist ##### -->
+<para>
+
+</para>
+
+ ecalcomps: 
+
+
+<!-- ##### FUNCTION e_cal_client_resolve_tzid_cb ##### -->
+<para>
+
+</para>
+
+ tzid: 
+ data: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_generate_instances ##### -->
+<para>
+
+</para>
+
+ client: 
+ start: 
+ end: 
+ cb: 
+ cb_data: 
+
+
+<!-- ##### FUNCTION e_cal_client_generate_instances_for_object ##### -->
+<para>
+
+</para>
+
+ client: 
+ icalcomp: 
+ start: 
+ end: 
+ cb: 
+ cb_data: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_component_as_string ##### -->
+<para>
+
+</para>
+
+ client: 
+ icalcomp: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_default_object ##### -->
+<para>
+
+</para>
+
+ client: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_default_object_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ icalcomp: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_default_object_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ icalcomp: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_object ##### -->
+<para>
+
+</para>
+
+ client: 
+ uid: 
+ rid: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_object_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ icalcomp: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_object_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ uid: 
+ rid: 
+ icalcomp: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_objects_for_uid ##### -->
+<para>
+
+</para>
+
+ client: 
+ uid: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_objects_for_uid_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ ecalcomps: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_objects_for_uid_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ uid: 
+ ecalcomps: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_object_list ##### -->
+<para>
+
+</para>
+
+ client: 
+ sexp: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_object_list_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ icalcomps: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_object_list_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ sexp: 
+ icalcomps: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_object_list_as_comps ##### -->
+<para>
+
+</para>
+
+ client: 
+ sexp: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_object_list_as_comps_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ ecalcomps: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_object_list_as_comps_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ sexp: 
+ ecalcomps: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_free_busy ##### -->
+<para>
+
+</para>
+
+ client: 
+ start: 
+ end: 
+ users: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_free_busy_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_free_busy_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ start: 
+ end: 
+ users: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_create_object ##### -->
+<para>
+
+</para>
+
+ client: 
+ icalcomp: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_cal_client_create_object_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ uid: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_create_object_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ icalcomp: 
+ uid: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_modify_object ##### -->
+<para>
+
+</para>
+
+ client: 
+ icalcomp: 
+ mod: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_cal_client_modify_object_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_modify_object_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ icalcomp: 
+ mod: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_remove_object ##### -->
+<para>
+
+</para>
+
+ client: 
+ uid: 
+ rid: 
+ mod: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_cal_client_remove_object_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_remove_object_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ uid: 
+ rid: 
+ mod: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_receive_objects ##### -->
+<para>
+
+</para>
+
+ client: 
+ icalcomp: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_cal_client_receive_objects_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_receive_objects_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ icalcomp: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_send_objects ##### -->
+<para>
+
+</para>
+
+ client: 
+ icalcomp: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_cal_client_send_objects_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ users: 
+ modified_icalcomp: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_send_objects_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ icalcomp: 
+ users: 
+ modified_icalcomp: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_attachment_uris ##### -->
+<para>
+
+</para>
+
+ client: 
+ uid: 
+ rid: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_attachment_uris_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ attachment_uris: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_attachment_uris_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ uid: 
+ rid: 
+ attachment_uris: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_discard_alarm ##### -->
+<para>
+
+</para>
+
+ client: 
+ uid: 
+ rid: 
+ auid: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_cal_client_discard_alarm_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_discard_alarm_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ uid: 
+ rid: 
+ auid: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_view ##### -->
+<para>
+
+</para>
+
+ client: 
+ sexp: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_view_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ view: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_view_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ sexp: 
+ view: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_timezone ##### -->
+<para>
+
+</para>
+
+ client: 
+ tzid: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_timezone_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ zone: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_get_timezone_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ tzid: 
+ zone: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_add_timezone ##### -->
+<para>
+
+</para>
+
+ client: 
+ zone: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_cal_client_add_timezone_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_client_add_timezone_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ zone: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
diff --git a/docs/reference/calendar/libecal/tmpl/e-cal-util.sgml b/docs/reference/calendar/libecal/tmpl/e-cal-util.sgml
index ba848d9..d940301 100644
--- a/docs/reference/calendar/libecal/tmpl/e-cal-util.sgml
+++ b/docs/reference/calendar/libecal/tmpl/e-cal-util.sgml
@@ -304,6 +304,13 @@ Various utility functions.
 
 
 
+<!-- ##### MACRO CAL_STATIC_CAPABILITY_REMOVE_ONLY_THIS ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### MACRO CAL_STATIC_CAPABILITY_ONE_ALARM_ONLY ##### -->
 <para>
 
diff --git a/docs/reference/calendar/libecal/tmpl/e-cal.sgml b/docs/reference/calendar/libecal/tmpl/e-cal.sgml
index 231c89c..af6cb45 100644
--- a/docs/reference/calendar/libecal/tmpl/e-cal.sgml
+++ b/docs/reference/calendar/libecal/tmpl/e-cal.sgml
@@ -95,6 +95,15 @@ Represents an entire calendar or task list, not individual items within them.2
 @E_CAL_LOAD_LOADING: 
 @E_CAL_LOAD_LOADED: 
 
+<!-- ##### ENUM EDataCalMode ##### -->
+<para>
+
+</para>
+
+ Local: 
+ Remote: 
+ AnyMode: 
+
 <!-- ##### USER_FUNCTION ECalAuthFunc ##### -->
 <para>
 
diff --git a/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt b/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt
index ddfeed8..9fbf1be 100644
--- a/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt
+++ b/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt
@@ -1,4 +1,82 @@
 <SECTION>
+<FILE>e-cal-backend</FILE>
+<TITLE>ECalBackend</TITLE>
+ECalBackend
+CLIENT_BACKEND_PROPERTY_OPENED
+CLIENT_BACKEND_PROPERTY_OPENING
+CLIENT_BACKEND_PROPERTY_ONLINE
+CLIENT_BACKEND_PROPERTY_READONLY
+CLIENT_BACKEND_PROPERTY_CACHE_DIR
+CLIENT_BACKEND_PROPERTY_CAPABILITIES
+CAL_BACKEND_PROPERTY_CAL_EMAIL_ADDRESS
+CAL_BACKEND_PROPERTY_ALARM_EMAIL_ADDRESS
+CAL_BACKEND_PROPERTY_DEFAULT_OBJECT
+e_cal_backend_get_source
+e_cal_backend_get_uri
+e_cal_backend_get_kind
+e_cal_backend_is_online
+e_cal_backend_is_opened
+e_cal_backend_is_opening
+e_cal_backend_is_readonly
+e_cal_backend_is_removed
+e_cal_backend_get_cache_dir
+e_cal_backend_set_cache_dir
+e_cal_backend_add_client
+e_cal_backend_remove_client
+e_cal_backend_add_view
+e_cal_backend_remove_view
+e_cal_backend_foreach_view
+e_cal_backend_set_notification_proxy
+e_cal_backend_get_backend_property
+e_cal_backend_set_backend_property
+e_cal_backend_set_online
+e_cal_backend_authenticate_user
+e_cal_backend_open
+e_cal_backend_remove
+e_cal_backend_refresh
+e_cal_backend_get_object
+e_cal_backend_get_object_list
+e_cal_backend_get_free_busy
+e_cal_backend_create_object
+e_cal_backend_modify_object
+e_cal_backend_remove_object
+e_cal_backend_receive_objects
+e_cal_backend_send_objects
+e_cal_backend_get_attachment_uris
+e_cal_backend_discard_alarm
+e_cal_backend_get_timezone
+e_cal_backend_add_timezone
+e_cal_backend_internal_get_timezone
+e_cal_backend_start_view
+e_cal_backend_stop_view
+e_cal_backend_notify_object_created
+e_cal_backend_notify_objects_added
+e_cal_backend_notify_object_modified
+e_cal_backend_notify_objects_modified
+e_cal_backend_notify_object_removed
+e_cal_backend_notify_objects_removed
+e_cal_backend_notify_error
+e_cal_backend_notify_readonly
+e_cal_backend_notify_online
+e_cal_backend_notify_auth_required
+e_cal_backend_notify_opened
+e_cal_backend_empty_cache
+e_cal_backend_set_is_removed
+e_cal_backend_respond_opened
+<SUBSECTION Standard>
+E_CAL_BACKEND
+E_IS_CAL_BACKEND
+E_TYPE_CAL_BACKEND
+E_CAL_BACKEND_CLASS
+E_IS_CAL_BACKEND_CLASS
+E_CAL_BACKEND_GET_CLASS
+ECalBackendClass
+<SUBSECTION Private>
+ECalBackendPrivate
+e_cal_backend_get_type
+</SECTION>
+
+<SECTION>
 <FILE>e-cal-backend-cache</FILE>
 <TITLE>ECalBackendCache</TITLE>
 ECalBackendCache
@@ -55,166 +133,21 @@ e_cal_backend_factory_get_type
 </SECTION>
 
 <SECTION>
-<FILE>e-intervaltree</FILE>
-<TITLE>EIntervalTree</TITLE>
-EIntervalTree
-e_intervaltree_new
-e_intervaltree_insert
-e_intervaltree_remove
-e_intervaltree_destroy
-e_intervaltree_search
-<SUBSECTION Standard>
-E_INTERVALTREE
-E_IS_INTERVALTREE
-E_TYPE_INTERVALTREE
-E_INTERVALTREE_CLASS
-E_IS_INTERVALTREE_CLASS
-E_INTERVALTREE_GET_CLASS
-EIntervalTreeClass
-<SUBSECTION Private>
-E_INTERVALTREE_DEBUG
-EIntervalTreePrivate
-e_intervaltree_get_type
-e_intervaltree_dump
-</SECTION>
-
-<SECTION>
-<FILE>e-cal-backend-sexp</FILE>
-<TITLE>ECalBackendSExp</TITLE>
-e_cal_backend_sexp_new
-e_cal_backend_sexp_text
-e_cal_backend_sexp_match_object
-e_cal_backend_sexp_match_comp
-e_cal_backend_sexp_func_time_now
-e_cal_backend_sexp_func_make_time
-e_cal_backend_sexp_func_time_add_day
-e_cal_backend_sexp_func_time_day_begin
-e_cal_backend_sexp_func_time_day_end
-e_cal_backend_sexp_evaluate_occur_times
-<SUBSECTION Standard>
-E_CAL_BACKEND_SEXP
-E_IS_CAL_BACKEND_SEXP
-E_TYPE_CAL_BACKEND_SEXP
-E_CAL_BACKEND_SEXP_CLASS
-E_IS_CAL_BACKEND_SEXP_CLASS
-E_CAL_BACKEND_SEXP_GET_CLASS
-<SUBSECTION Private>
-ECalBackendSExpPrivate
-e_cal_backend_sexp_get_type
-</SECTION>
-
-<SECTION>
-<FILE>e-cal-backend-sync</FILE>
-<TITLE>ECalBackendSync</TITLE>
-ECalBackendSync
-ECalBackendSyncFactoryFn
-e_cal_backend_sync_set_lock
-e_cal_backend_sync_is_read_only
-e_cal_backend_sync_get_cal_address
-e_cal_backend_sync_get_alarm_email_address
-e_cal_backend_sync_get_ldap_attribute
-e_cal_backend_sync_get_static_capabilities
-e_cal_backend_sync_open
-e_cal_backend_sync_refresh
-e_cal_backend_sync_remove
-e_cal_backend_sync_create_object
-e_cal_backend_sync_modify_object
-e_cal_backend_sync_remove_object
-e_cal_backend_sync_get_attachment_list
-e_cal_backend_sync_discard_alarm
-e_cal_backend_sync_receive_objects
-e_cal_backend_sync_send_objects
-e_cal_backend_sync_get_default_object
-e_cal_backend_sync_get_object
-e_cal_backend_sync_get_object_list
-e_cal_backend_sync_get_timezone
-e_cal_backend_sync_add_timezone
-e_cal_backend_sync_set_default_zone
-e_cal_backend_sync_get_changes
-e_cal_backend_sync_get_free_busy
-<SUBSECTION Standard>
-E_CAL_BACKEND_SYNC
-E_IS_CAL_BACKEND_SYNC
-E_TYPE_CAL_BACKEND_SYNC
-E_CAL_BACKEND_SYNC_CLASS
-E_IS_CAL_BACKEND_SYNC_CLASS
-E_CAL_BACKEND_SYNC_GET_CLASS
-ECalBackendSyncClass
-<SUBSECTION Private>
-ECalBackendSyncPrivate
-e_cal_backend_sync_get_type
-</SECTION>
-
-<SECTION>
-<FILE>e-cal-backend</FILE>
-<TITLE>ECalBackend</TITLE>
-ECalBackend
-e_cal_backend_get_source
-e_cal_backend_get_uri
-e_cal_backend_get_kind
-e_cal_backend_get_cache_dir
-e_cal_backend_set_cache_dir
-e_cal_backend_add_client
-e_cal_backend_remove_client
-e_cal_backend_add_query
-e_cal_backend_get_queries
-e_cal_backend_remove_query
-e_cal_backend_is_read_only
-e_cal_backend_get_cal_address
-e_cal_backend_get_alarm_email_address
-e_cal_backend_get_ldap_attribute
-e_cal_backend_get_static_capabilities
-e_cal_backend_open
-e_cal_backend_refresh
-e_cal_backend_remove
-e_cal_backend_create_object
-e_cal_backend_modify_object
-e_cal_backend_remove_object
-e_cal_backend_discard_alarm
-e_cal_backend_receive_objects
-e_cal_backend_send_objects
-e_cal_backend_get_default_object
-e_cal_backend_get_object
-e_cal_backend_get_object_list
-e_cal_backend_get_attachment_list
-e_cal_backend_is_loaded
-e_cal_backend_start_query
-e_cal_backend_get_mode
-e_cal_backend_set_mode
-e_cal_backend_get_timezone
-e_cal_backend_add_timezone
-e_cal_backend_set_default_zone
-e_cal_backend_get_changes
-e_cal_backend_get_free_busy
-e_cal_backend_internal_get_default_timezone
-e_cal_backend_internal_get_timezone
-e_cal_backend_set_notification_proxy
-e_cal_backend_notify_object_created
-e_cal_backend_notify_object_modified
-e_cal_backend_notify_object_removed
-e_cal_backend_notify_mode
-e_cal_backend_notify_auth_required
-e_cal_backend_notify_error
-e_cal_backend_notify_view_done
-e_cal_backend_notify_view_progress_start
-e_cal_backend_notify_view_progress
-e_cal_backend_notify_readonly
-e_cal_backend_notify_cal_address
-e_cal_backend_notify_objects_added
-e_cal_backend_notify_objects_removed
-e_cal_backend_notify_objects_modified
-e_cal_backend_empty_cache
+<FILE>e-cal-backend-file-store</FILE>
+<TITLE>ECalBackendFileStore</TITLE>
+ECalBackendFileStore
+e_cal_backend_file_store_new
 <SUBSECTION Standard>
-E_CAL_BACKEND
-E_IS_CAL_BACKEND
-E_TYPE_CAL_BACKEND
-E_CAL_BACKEND_CLASS
-E_IS_CAL_BACKEND_CLASS
-E_CAL_BACKEND_GET_CLASS
-ECalBackendClass
+E_CAL_BACKEND_FILE_STORE
+E_IS_CAL_BACKEND_FILE_STORE
+E_TYPE_CAL_BACKEND_FILE_STORE
+E_CAL_BACKEND_FILE_STORE_CLASS
+E_IS_CAL_BACKEND_FILE_STORE_CLASS
+E_CAL_BACKEND_FILE_STORE_GET_CLASS
+ECalBackendFileStoreClass
 <SUBSECTION Private>
-ECalBackendPrivate
-e_cal_backend_get_type
+ECalBackendFileStorePrivate
+e_cal_backend_file_store_get_type
 </SECTION>
 
 <SECTION>
@@ -276,21 +209,71 @@ e_cal_backend_store_get_type
 </SECTION>
 
 <SECTION>
-<FILE>e-cal-backend-file-store</FILE>
-<TITLE>ECalBackendFileStore</TITLE>
-ECalBackendFileStore
-e_cal_backend_file_store_new
+<FILE>e-cal-backend-sexp</FILE>
+<TITLE>ECalBackendSExp</TITLE>
+e_cal_backend_sexp_new
+e_cal_backend_sexp_text
+e_cal_backend_sexp_match_object
+e_cal_backend_sexp_match_comp
+e_cal_backend_sexp_func_time_now
+e_cal_backend_sexp_func_make_time
+e_cal_backend_sexp_func_time_add_day
+e_cal_backend_sexp_func_time_day_begin
+e_cal_backend_sexp_func_time_day_end
+e_cal_backend_sexp_evaluate_occur_times
 <SUBSECTION Standard>
-E_CAL_BACKEND_FILE_STORE
-E_IS_CAL_BACKEND_FILE_STORE
-E_TYPE_CAL_BACKEND_FILE_STORE
-E_CAL_BACKEND_FILE_STORE_CLASS
-E_IS_CAL_BACKEND_FILE_STORE_CLASS
-E_CAL_BACKEND_FILE_STORE_GET_CLASS
-ECalBackendFileStoreClass
+E_CAL_BACKEND_SEXP
+E_IS_CAL_BACKEND_SEXP
+E_TYPE_CAL_BACKEND_SEXP
+E_CAL_BACKEND_SEXP_CLASS
+E_IS_CAL_BACKEND_SEXP_CLASS
+E_CAL_BACKEND_SEXP_GET_CLASS
 <SUBSECTION Private>
-ECalBackendFileStorePrivate
-e_cal_backend_file_store_get_type
+ECalBackendSExpPrivate
+e_cal_backend_sexp_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-cal-backend-sync</FILE>
+<TITLE>ECalBackendSync</TITLE>
+ECalBackendSync
+e_cal_backend_sync_set_lock
+e_cal_backend_sync_open
+e_cal_backend_sync_remove
+e_cal_backend_sync_refresh
+e_cal_backend_sync_get_backend_property
+e_cal_backend_sync_set_backend_property
+e_cal_backend_sync_get_object
+e_cal_backend_sync_get_object_list
+e_cal_backend_sync_get_free_busy
+e_cal_backend_sync_create_object
+e_cal_backend_sync_modify_object
+e_cal_backend_sync_remove_object
+e_cal_backend_sync_receive_objects
+e_cal_backend_sync_send_objects
+e_cal_backend_sync_get_attachment_uris
+e_cal_backend_sync_discard_alarm
+e_cal_backend_sync_get_timezone
+e_cal_backend_sync_add_timezone
+e_cal_backend_sync_authenticate_user
+<SUBSECTION Standard>
+E_CAL_BACKEND_SYNC
+E_IS_CAL_BACKEND_SYNC
+E_TYPE_CAL_BACKEND_SYNC
+E_CAL_BACKEND_SYNC_CLASS
+E_IS_CAL_BACKEND_SYNC_CLASS
+E_CAL_BACKEND_SYNC_GET_CLASS
+ECalBackendSyncClass
+<SUBSECTION Private>
+ECalBackendSyncPrivate
+e_cal_backend_sync_get_type
+</SECTION>
+
+<SECTION>
+<FILE>e-cal-backend-util</FILE>
+e_cal_backend_mail_account_get_default
+e_cal_backend_mail_account_is_valid
+e_cal_backend_user_declined
 </SECTION>
 
 <SECTION>
@@ -302,37 +285,35 @@ e_data_cal_create_error
 e_data_cal_create_error_fmt
 e_data_cal_status_to_string
 e_return_data_cal_error_if_fail
+e_return_data_cal_error_val_if_fail
 e_data_cal_new
-e_data_cal_register_gdbus_object
 e_data_cal_get_backend
 e_data_cal_get_source
-e_data_cal_notify_read_only
-e_data_cal_notify_cal_address
-e_data_cal_notify_alarm_email_address
-e_data_cal_notify_ldap_attribute
-e_data_cal_notify_static_capabilities
-e_data_cal_notify_open
-e_data_cal_notify_refresh
-e_data_cal_notify_remove
-e_data_cal_notify_object_created
-e_data_cal_notify_object_modified
-e_data_cal_notify_object_removed
-e_data_cal_notify_alarm_discarded
-e_data_cal_notify_objects_received
-e_data_cal_notify_objects_sent
-e_data_cal_notify_default_object
-e_data_cal_notify_object
-e_data_cal_notify_object_list
-e_data_cal_notify_query
-e_data_cal_notify_timezone_requested
-e_data_cal_notify_timezone_added
-e_data_cal_notify_default_timezone_set
-e_data_cal_notify_changes
-e_data_cal_notify_free_busy
-e_data_cal_notify_mode
-e_data_cal_notify_auth_required
-e_data_cal_notify_error
-e_data_cal_notify_attachment_list
+e_data_cal_register_gdbus_object
+e_data_cal_respond_open
+e_data_cal_respond_remove
+e_data_cal_respond_refresh
+e_data_cal_respond_get_backend_property
+e_data_cal_respond_set_backend_property
+e_data_cal_respond_get_object
+e_data_cal_respond_get_object_list
+e_data_cal_respond_get_free_busy
+e_data_cal_respond_create_object
+e_data_cal_respond_modify_object
+e_data_cal_respond_remove_object
+e_data_cal_respond_receive_objects
+e_data_cal_respond_send_objects
+e_data_cal_respond_get_attachment_uris
+e_data_cal_respond_discard_alarm
+e_data_cal_respond_get_view
+e_data_cal_respond_get_timezone
+e_data_cal_respond_add_timezone
+e_data_cal_report_error
+e_data_cal_report_readonly
+e_data_cal_report_online
+e_data_cal_report_auth_required
+e_data_cal_report_opened
+e_data_cal_report_free_busy_data
 <SUBSECTION Standard>
 E_DATA_CAL
 E_IS_DATA_CAL
@@ -357,17 +338,9 @@ e_data_cal_view_listener_set_mode_status_get_type
 </SECTION>
 
 <SECTION>
-<FILE>e-cal-backend-util</FILE>
-e_cal_backend_mail_account_get_default
-e_cal_backend_mail_account_is_valid
-e_cal_backend_user_declined
-</SECTION>
-
-<SECTION>
 <FILE>e-data-cal-common</FILE>
 ECalBackendSExp
 ECalBackendSExpClass
-EServerMethodContext
 </SECTION>
 
 <SECTION>
@@ -380,7 +353,7 @@ e_data_cal_factory_register_backend
 e_data_cal_factory_register_backends
 e_data_cal_factory_get_n_backends
 e_data_cal_factory_dump_active_backends
-e_data_cal_factory_set_backend_mode
+e_data_cal_factory_set_backend_online
 <SUBSECTION Standard>
 E_DATA_CAL_FACTORY
 E_IS_DATA_CAL_FACTORY
@@ -397,17 +370,15 @@ e_data_cal_factory_error_quark
 <SECTION>
 <FILE>e-data-cal-view</FILE>
 <TITLE>EDataCalView</TITLE>
-QUERY
-IS_QUERY
 e_data_cal_view_new
 e_data_cal_view_register_gdbus_object
 e_data_cal_view_get_text
 e_data_cal_view_get_object_sexp
 e_data_cal_view_object_matches
-e_data_cal_view_get_matched_objects
 e_data_cal_view_is_started
-e_data_cal_view_is_done
+e_data_cal_view_is_completed
 e_data_cal_view_is_stopped
+e_data_cal_view_get_fields_of_interest
 e_data_cal_view_notify_objects_added
 e_data_cal_view_notify_objects_added_1
 e_data_cal_view_notify_objects_modified
@@ -415,7 +386,7 @@ e_data_cal_view_notify_objects_modified_1
 e_data_cal_view_notify_objects_removed
 e_data_cal_view_notify_objects_removed_1
 e_data_cal_view_notify_progress
-e_data_cal_view_notify_done
+e_data_cal_view_notify_complete
 <SUBSECTION Standard>
 E_DATA_CAL_VIEW
 E_IS_DATA_CAL_VIEW
@@ -426,3 +397,28 @@ IS_E_DATA_CAL_VIEW_CLASS
 EDataCalViewPrivate
 e_data_cal_view_get_type
 </SECTION>
+
+<SECTION>
+<FILE>e-intervaltree</FILE>
+<TITLE>EIntervalTree</TITLE>
+EIntervalTree
+e_intervaltree_new
+e_intervaltree_insert
+e_intervaltree_remove
+e_intervaltree_destroy
+e_intervaltree_search
+<SUBSECTION Standard>
+E_INTERVALTREE
+E_IS_INTERVALTREE
+E_TYPE_INTERVALTREE
+E_INTERVALTREE_CLASS
+E_IS_INTERVALTREE_CLASS
+E_INTERVALTREE_GET_CLASS
+EIntervalTreeClass
+<SUBSECTION Private>
+E_INTERVALTREE_DEBUG
+EIntervalTreePrivate
+e_intervaltree_get_type
+e_intervaltree_dump
+</SECTION>
+
diff --git a/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend-sync.sgml b/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend-sync.sgml
index 66cd384..da68e6b 100644
--- a/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend-sync.sgml
+++ b/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend-sync.sgml
@@ -47,6 +47,17 @@ Base class for synchronous backends.
 @error: 
 
 
+<!-- ##### FUNCTION e_cal_backend_sync_remove ##### -->
+<para>
+
+</para>
+
+ backend: 
+ cal: 
+ cancellable: 
+ error: 
+
+
 <!-- ##### FUNCTION e_cal_backend_sync_refresh ##### -->
 <para>
 
@@ -58,7 +69,7 @@ Base class for synchronous backends.
 @error: 
 
 
-<!-- ##### FUNCTION e_cal_backend_sync_remove ##### -->
+<!-- ##### FUNCTION e_cal_backend_sync_get_backend_property ##### -->
 <para>
 
 </para>
@@ -66,10 +77,27 @@ Base class for synchronous backends.
 @backend: 
 @cal: 
 @cancellable: 
+ prop_name: 
+ prop_value: 
 @error: 
+ Returns: 
 
 
-<!-- ##### FUNCTION e_cal_backend_sync_create_object ##### -->
+<!-- ##### FUNCTION e_cal_backend_sync_set_backend_property ##### -->
+<para>
+
+</para>
+
+ backend: 
+ cal: 
+ cancellable: 
+ prop_name: 
+ prop_value: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_backend_sync_get_object ##### -->
 <para>
 
 </para>
@@ -77,13 +105,41 @@ Base class for synchronous backends.
 @backend: 
 @cal: 
 @cancellable: 
- calobj: 
 @uid: 
- new_object: 
+ rid: 
+ calobj: 
 @error: 
 
 
-<!-- ##### FUNCTION e_cal_backend_sync_modify_object ##### -->
+<!-- ##### FUNCTION e_cal_backend_sync_get_object_list ##### -->
+<para>
+
+</para>
+
+ backend: 
+ cal: 
+ cancellable: 
+ sexp: 
+ calobjs: 
+ error: 
+
+
+<!-- ##### FUNCTION e_cal_backend_sync_get_free_busy ##### -->
+<para>
+
+</para>
+
+ backend: 
+ cal: 
+ cancellable: 
+ users: 
+ start: 
+ end: 
+ freebusyobjs: 
+ error: 
+
+
+<!-- ##### FUNCTION e_cal_backend_sync_create_object ##### -->
 <para>
 
 </para>
@@ -92,13 +148,12 @@ Base class for synchronous backends.
 @cal: 
 @cancellable: 
 @calobj: 
- mod: 
- old_object: 
+ uid: 
 @new_object: 
 @error: 
 
 
-<!-- ##### FUNCTION e_cal_backend_sync_remove_object ##### -->
+<!-- ##### FUNCTION e_cal_backend_sync_modify_object ##### -->
 <para>
 
 </para>
@@ -106,15 +161,14 @@ Base class for synchronous backends.
 @backend: 
 @cal: 
 @cancellable: 
- uid: 
- rid: 
+ calobj: 
 @mod: 
 @old_object: 
 @new_object: 
 @error: 
 
 
-<!-- ##### FUNCTION e_cal_backend_sync_discard_alarm ##### -->
+<!-- ##### FUNCTION e_cal_backend_sync_remove_object ##### -->
 <para>
 
 </para>
@@ -124,7 +178,9 @@ Base class for synchronous backends.
 @cancellable: 
 @uid: 
 @rid: 
- auid: 
+ mod: 
+ old_object: 
+ new_object: 
 @error: 
 
 
@@ -154,7 +210,7 @@ Base class for synchronous backends.
 @error: 
 
 
-<!-- ##### FUNCTION e_cal_backend_sync_get_object ##### -->
+<!-- ##### FUNCTION e_cal_backend_sync_get_attachment_uris ##### -->
 <para>
 
 </para>
@@ -164,11 +220,11 @@ Base class for synchronous backends.
 @cancellable: 
 @uid: 
 @rid: 
- calobj: 
+ attachments: 
 @error: 
 
 
-<!-- ##### FUNCTION e_cal_backend_sync_get_object_list ##### -->
+<!-- ##### FUNCTION e_cal_backend_sync_discard_alarm ##### -->
 <para>
 
 </para>
@@ -176,8 +232,9 @@ Base class for synchronous backends.
 @backend: 
 @cal: 
 @cancellable: 
- sexp: 
- calobjs: 
+ uid: 
+ rid: 
+ auid: 
 @error: 
 
 
@@ -206,18 +263,14 @@ Base class for synchronous backends.
 @error: 
 
 
-<!-- ##### FUNCTION e_cal_backend_sync_get_free_busy ##### -->
+<!-- ##### FUNCTION e_cal_backend_sync_authenticate_user ##### -->
 <para>
 
 </para>
 
 @backend: 
- cal: 
 @cancellable: 
- users: 
- start: 
- end: 
- freebusyobjs: 
+ credentials: 
 @error: 
 
 
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 4fe0021..ffe51fc 100644
--- a/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend.sgml
+++ b/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend.sgml
@@ -53,6 +53,69 @@ Base class for calendar/tasks backend implementations.
 
 </para>
 
+<!-- ##### MACRO CLIENT_BACKEND_PROPERTY_OPENED ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CLIENT_BACKEND_PROPERTY_OPENING ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CLIENT_BACKEND_PROPERTY_ONLINE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CLIENT_BACKEND_PROPERTY_READONLY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CLIENT_BACKEND_PROPERTY_CACHE_DIR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CLIENT_BACKEND_PROPERTY_CAPABILITIES ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CAL_BACKEND_PROPERTY_CAL_EMAIL_ADDRESS ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CAL_BACKEND_PROPERTY_ALARM_EMAIL_ADDRESS ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CAL_BACKEND_PROPERTY_DEFAULT_OBJECT ##### -->
+<para>
+
+</para>
+
+
+
 <!-- ##### FUNCTION e_cal_backend_get_source ##### -->
 <para>
 
@@ -80,6 +143,51 @@ Base class for calendar/tasks backend implementations.
 @Returns: 
 
 
+<!-- ##### FUNCTION e_cal_backend_is_online ##### -->
+<para>
+
+</para>
+
+ backend: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_backend_is_opened ##### -->
+<para>
+
+</para>
+
+ backend: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_backend_is_opening ##### -->
+<para>
+
+</para>
+
+ backend: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_backend_is_readonly ##### -->
+<para>
+
+</para>
+
+ backend: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_cal_backend_is_removed ##### -->
+<para>
+
+</para>
+
+ backend: 
+ Returns: 
+
+
 <!-- ##### FUNCTION e_cal_backend_get_cache_dir ##### -->
 <para>
 
@@ -116,6 +224,93 @@ Base class for calendar/tasks backend implementations.
 @cal: 
 
 
+<!-- ##### FUNCTION e_cal_backend_add_view ##### -->
+<para>
+
+</para>
+
+ backend: 
+ view: 
+
+
+<!-- ##### FUNCTION e_cal_backend_remove_view ##### -->
+<para>
+
+</para>
+
+ backend: 
+ view: 
+
+
+<!-- ##### FUNCTION e_cal_backend_foreach_view ##### -->
+<para>
+
+</para>
+
+ backend: 
+ 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:
+ EDataCalView *view, gpointer user_data:
+ EDataCalView *view, gpointer user_data: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_cal_backend_set_notification_proxy ##### -->
+<para>
+
+</para>
+
+ backend: 
+ proxy: 
+
+
+<!-- ##### FUNCTION e_cal_backend_get_backend_property ##### -->
+<para>
+
+</para>
+
+ backend: 
+ cal: 
+ opid: 
+ cancellable: 
+ prop_name: 
+
+
+<!-- ##### FUNCTION e_cal_backend_set_backend_property ##### -->
+<para>
+
+</para>
+
+ backend: 
+ cal: 
+ opid: 
+ cancellable: 
+ prop_name: 
+ prop_value: 
+
+
+<!-- ##### FUNCTION e_cal_backend_set_online ##### -->
+<para>
+
+</para>
+
+ backend: 
+ is_online: 
+
+
+<!-- ##### FUNCTION e_cal_backend_authenticate_user ##### -->
+<para>
+
+</para>
+
+ backend: 
+ cancellable: 
+ credentials: 
+
+
 <!-- ##### FUNCTION e_cal_backend_open ##### -->
 <para>
 
@@ -128,6 +323,17 @@ Base class for calendar/tasks backend implementations.
 @only_if_exists: 
 
 
+<!-- ##### FUNCTION e_cal_backend_remove ##### -->
+<para>
+
+</para>
+
+ backend: 
+ cal: 
+ opid: 
+ cancellable: 
+
+
 <!-- ##### FUNCTION e_cal_backend_refresh ##### -->
 <para>
 
@@ -139,7 +345,7 @@ Base class for calendar/tasks backend implementations.
 @cancellable: 
 
 
-<!-- ##### FUNCTION e_cal_backend_remove ##### -->
+<!-- ##### FUNCTION e_cal_backend_get_object ##### -->
 <para>
 
 </para>
@@ -148,9 +354,11 @@ Base class for calendar/tasks backend implementations.
 @cal: 
 @opid: 
 @cancellable: 
+ uid: 
+ rid: 
 
 
-<!-- ##### FUNCTION e_cal_backend_create_object ##### -->
+<!-- ##### FUNCTION e_cal_backend_get_object_list ##### -->
 <para>
 
 </para>
@@ -159,10 +367,24 @@ Base class for calendar/tasks backend implementations.
 @cal: 
 @opid: 
 @cancellable: 
- calobj: 
+ sexp: 
 
 
-<!-- ##### FUNCTION e_cal_backend_modify_object ##### -->
+<!-- ##### FUNCTION e_cal_backend_get_free_busy ##### -->
+<para>
+
+</para>
+
+ backend: 
+ cal: 
+ opid: 
+ cancellable: 
+ users: 
+ start: 
+ end: 
+
+
+<!-- ##### FUNCTION e_cal_backend_create_object ##### -->
 <para>
 
 </para>
@@ -172,10 +394,9 @@ Base class for calendar/tasks backend implementations.
 @opid: 
 @cancellable: 
 @calobj: 
- mod: 
 
 
-<!-- ##### FUNCTION e_cal_backend_remove_object ##### -->
+<!-- ##### FUNCTION e_cal_backend_modify_object ##### -->
 <para>
 
 </para>
@@ -184,12 +405,11 @@ Base class for calendar/tasks backend implementations.
 @cal: 
 @opid: 
 @cancellable: 
- uid: 
- rid: 
+ calobj: 
 @mod: 
 
 
-<!-- ##### FUNCTION e_cal_backend_discard_alarm ##### -->
+<!-- ##### FUNCTION e_cal_backend_remove_object ##### -->
 <para>
 
 </para>
@@ -200,7 +420,7 @@ Base class for calendar/tasks backend implementations.
 @cancellable: 
 @uid: 
 @rid: 
- auid: 
+ mod: 
 
 
 <!-- ##### FUNCTION e_cal_backend_receive_objects ##### -->
@@ -227,7 +447,7 @@ Base class for calendar/tasks backend implementations.
 @calobj: 
 
 
-<!-- ##### FUNCTION e_cal_backend_get_object ##### -->
+<!-- ##### FUNCTION e_cal_backend_get_attachment_uris ##### -->
 <para>
 
 </para>
@@ -240,7 +460,7 @@ Base class for calendar/tasks backend implementations.
 @rid: 
 
 
-<!-- ##### FUNCTION e_cal_backend_get_object_list ##### -->
+<!-- ##### FUNCTION e_cal_backend_discard_alarm ##### -->
 <para>
 
 </para>
@@ -249,7 +469,9 @@ Base class for calendar/tasks backend implementations.
 @cal: 
 @opid: 
 @cancellable: 
- sexp: 
+ uid: 
+ rid: 
+ auid: 
 
 
 <!-- ##### FUNCTION e_cal_backend_get_timezone ##### -->
@@ -276,37 +498,32 @@ Base class for calendar/tasks backend implementations.
 @tzobject: 
 
 
-<!-- ##### FUNCTION e_cal_backend_get_free_busy ##### -->
+<!-- ##### FUNCTION e_cal_backend_internal_get_timezone ##### -->
 <para>
 
 </para>
 
 @backend: 
- cal: 
- opid: 
- cancellable: 
- users: 
- start: 
- end: 
+ tzid: 
+ Returns: 
 
 
-<!-- ##### FUNCTION e_cal_backend_internal_get_timezone ##### -->
+<!-- ##### FUNCTION e_cal_backend_start_view ##### -->
 <para>
 
 </para>
 
 @backend: 
- tzid: 
- Returns: 
+ view: 
 
 
-<!-- ##### FUNCTION e_cal_backend_set_notification_proxy ##### -->
+<!-- ##### FUNCTION e_cal_backend_stop_view ##### -->
 <para>
 
 </para>
 
 @backend: 
- proxy: 
+ view: 
 
 
 <!-- ##### FUNCTION e_cal_backend_notify_object_created ##### -->
@@ -318,6 +535,16 @@ Base class for calendar/tasks backend implementations.
 @calobj: 
 
 
+<!-- ##### FUNCTION e_cal_backend_notify_objects_added ##### -->
+<para>
+
+</para>
+
+ backend: 
+ view: 
+ objects: 
+
+
 <!-- ##### FUNCTION e_cal_backend_notify_object_modified ##### -->
 <para>
 
@@ -328,6 +555,16 @@ Base class for calendar/tasks backend implementations.
 @object: 
 
 
+<!-- ##### FUNCTION e_cal_backend_notify_objects_modified ##### -->
+<para>
+
+</para>
+
+ backend: 
+ view: 
+ objects: 
+
+
 <!-- ##### FUNCTION e_cal_backend_notify_object_removed ##### -->
 <para>
 
@@ -339,14 +576,14 @@ Base class for calendar/tasks backend implementations.
 @object: 
 
 
-<!-- ##### FUNCTION e_cal_backend_notify_auth_required ##### -->
+<!-- ##### FUNCTION e_cal_backend_notify_objects_removed ##### -->
 <para>
 
 </para>
 
 @backend: 
- is_self: 
- credentials: 
+ view: 
+ ids: 
 
 
 <!-- ##### FUNCTION e_cal_backend_notify_error ##### -->
@@ -367,34 +604,32 @@ Base class for calendar/tasks backend implementations.
 @is_readonly: 
 
 
-<!-- ##### FUNCTION e_cal_backend_notify_objects_added ##### -->
+<!-- ##### FUNCTION e_cal_backend_notify_online ##### -->
 <para>
 
 </para>
 
 @backend: 
- view: 
- objects: 
+ is_online: 
 
 
-<!-- ##### FUNCTION e_cal_backend_notify_objects_removed ##### -->
+<!-- ##### FUNCTION e_cal_backend_notify_auth_required ##### -->
 <para>
 
 </para>
 
 @backend: 
- view: 
- ids: 
+ is_self: 
+ credentials: 
 
 
-<!-- ##### FUNCTION e_cal_backend_notify_objects_modified ##### -->
+<!-- ##### FUNCTION e_cal_backend_notify_opened ##### -->
 <para>
 
 </para>
 
 @backend: 
- view: 
- objects: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_empty_cache ##### -->
@@ -406,3 +641,23 @@ Base class for calendar/tasks backend implementations.
 @cache: 
 
 
+<!-- ##### FUNCTION e_cal_backend_set_is_removed ##### -->
+<para>
+
+</para>
+
+ backend: 
+ is_removed: 
+
+
+<!-- ##### FUNCTION e_cal_backend_respond_opened ##### -->
+<para>
+
+</para>
+
+ backend: 
+ cal: 
+ opid: 
+ error: 
+
+
diff --git a/docs/reference/calendar/libedata-cal/tmpl/e-data-cal-factory.sgml b/docs/reference/calendar/libedata-cal/tmpl/e-data-cal-factory.sgml
index e76ae50..64cca46 100644
--- a/docs/reference/calendar/libedata-cal/tmpl/e-data-cal-factory.sgml
+++ b/docs/reference/calendar/libedata-cal/tmpl/e-data-cal-factory.sgml
@@ -76,3 +76,12 @@ Implementation of the calendar CORBA factory.
 @factory: 
 
 
+<!-- ##### FUNCTION e_data_cal_factory_set_backend_online ##### -->
+<para>
+
+</para>
+
+ factory: 
+ is_online: 
+
+
diff --git a/docs/reference/calendar/libedata-cal/tmpl/e-data-cal-view.sgml b/docs/reference/calendar/libedata-cal/tmpl/e-data-cal-view.sgml
index 366e0e8..4220168 100644
--- a/docs/reference/calendar/libedata-cal/tmpl/e-data-cal-view.sgml
+++ b/docs/reference/calendar/libedata-cal/tmpl/e-data-cal-view.sgml
@@ -79,6 +79,15 @@ Implementation of the calendar CORBA search interface.
 @Returns: 
 
 
+<!-- ##### FUNCTION e_data_cal_view_is_completed ##### -->
+<para>
+
+</para>
+
+ view: 
+ Returns: 
+
+
 <!-- ##### FUNCTION e_data_cal_view_is_stopped ##### -->
 <para>
 
@@ -88,6 +97,15 @@ Implementation of the calendar CORBA search interface.
 @Returns: 
 
 
+<!-- ##### FUNCTION e_data_cal_view_get_fields_of_interest ##### -->
+<para>
+
+</para>
+
+ view: 
+ Returns: 
+
+
 <!-- ##### FUNCTION e_data_cal_view_notify_objects_added ##### -->
 <para>
 
@@ -152,3 +170,12 @@ Implementation of the calendar CORBA search interface.
 @message: 
 
 
+<!-- ##### FUNCTION e_data_cal_view_notify_complete ##### -->
+<para>
+
+</para>
+
+ view: 
+ error: 
+
+
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 29c67c0..24aca0a 100644
--- a/docs/reference/calendar/libedata-cal/tmpl/e-data-cal.sgml
+++ b/docs/reference/calendar/libedata-cal/tmpl/e-data-cal.sgml
@@ -72,6 +72,15 @@ Implementation of the calendar CORBA client interface.
 @_code: 
 
 
+<!-- ##### MACRO e_return_data_cal_error_val_if_fail ##### -->
+<para>
+
+</para>
+
+ expr: 
+ _code: 
+
+
 <!-- ##### FUNCTION e_data_cal_new ##### -->
 <para>
 
@@ -82,6 +91,24 @@ Implementation of the calendar CORBA client interface.
 @Returns: 
 
 
+<!-- ##### FUNCTION e_data_cal_get_backend ##### -->
+<para>
+
+</para>
+
+ cal: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_data_cal_get_source ##### -->
+<para>
+
+</para>
+
+ cal: 
+ Returns: 
+
+
 <!-- ##### FUNCTION e_data_cal_register_gdbus_object ##### -->
 <para>
 
@@ -94,21 +121,252 @@ Implementation of the calendar CORBA client interface.
 @Returns: 
 
 
-<!-- ##### FUNCTION e_data_cal_get_backend ##### -->
+<!-- ##### FUNCTION e_data_cal_respond_open ##### -->
 <para>
 
 </para>
 
 @cal: 
- Returns: 
+ opid: 
+ error: 
 
 
-<!-- ##### FUNCTION e_data_cal_get_source ##### -->
+<!-- ##### FUNCTION e_data_cal_respond_remove ##### -->
 <para>
 
 </para>
 
 @cal: 
- Returns: 
+ opid: 
+ error: 
+
+
+<!-- ##### FUNCTION e_data_cal_respond_refresh ##### -->
+<para>
+
+</para>
+
+ cal: 
+ opid: 
+ error: 
+
+
+<!-- ##### FUNCTION e_data_cal_respond_get_backend_property ##### -->
+<para>
+
+</para>
+
+ cal: 
+ opid: 
+ error: 
+ prop_value: 
+
+
+<!-- ##### FUNCTION e_data_cal_respond_set_backend_property ##### -->
+<para>
+
+</para>
+
+ cal: 
+ opid: 
+ error: 
+
+
+<!-- ##### FUNCTION e_data_cal_respond_get_object ##### -->
+<para>
+
+</para>
+
+ cal: 
+ opid: 
+ error: 
+ object: 
+
+
+<!-- ##### FUNCTION e_data_cal_respond_get_object_list ##### -->
+<para>
+
+</para>
+
+ cal: 
+ opid: 
+ error: 
+ objects: 
+
+
+<!-- ##### FUNCTION e_data_cal_respond_get_free_busy ##### -->
+<para>
+
+</para>
+
+ cal: 
+ opid: 
+ error: 
+
+
+<!-- ##### FUNCTION e_data_cal_respond_create_object ##### -->
+<para>
+
+</para>
+
+ cal: 
+ opid: 
+ error: 
+ uid: 
+ object: 
+
+
+<!-- ##### FUNCTION e_data_cal_respond_modify_object ##### -->
+<para>
+
+</para>
+
+ cal: 
+ opid: 
+ error: 
+ old_object: 
+ object: 
+
+
+<!-- ##### FUNCTION e_data_cal_respond_remove_object ##### -->
+<para>
+
+</para>
+
+ cal: 
+ opid: 
+ error: 
+ id: 
+ old_object: 
+ object: 
+
+
+<!-- ##### FUNCTION e_data_cal_respond_receive_objects ##### -->
+<para>
+
+</para>
+
+ cal: 
+ opid: 
+ error: 
+
+
+<!-- ##### FUNCTION e_data_cal_respond_send_objects ##### -->
+<para>
+
+</para>
+
+ cal: 
+ opid: 
+ error: 
+ users: 
+ calobj: 
+
+
+<!-- ##### FUNCTION e_data_cal_respond_get_attachment_uris ##### -->
+<para>
+
+</para>
+
+ cal: 
+ opid: 
+ error: 
+ attachments: 
+
+
+<!-- ##### FUNCTION e_data_cal_respond_discard_alarm ##### -->
+<para>
+
+</para>
+
+ cal: 
+ opid: 
+ error: 
+
+
+<!-- ##### FUNCTION e_data_cal_respond_get_view ##### -->
+<para>
+
+</para>
+
+ cal: 
+ opid: 
+ error: 
+ view_path: 
+
+
+<!-- ##### FUNCTION e_data_cal_respond_get_timezone ##### -->
+<para>
+
+</para>
+
+ cal: 
+ opid: 
+ error: 
+ tzobject: 
+
+
+<!-- ##### FUNCTION e_data_cal_respond_add_timezone ##### -->
+<para>
+
+</para>
+
+ cal: 
+ opid: 
+ error: 
+
+
+<!-- ##### FUNCTION e_data_cal_report_error ##### -->
+<para>
+
+</para>
+
+ cal: 
+ message: 
+
+
+<!-- ##### FUNCTION e_data_cal_report_readonly ##### -->
+<para>
+
+</para>
+
+ cal: 
+ is_readonly: 
+
+
+<!-- ##### FUNCTION e_data_cal_report_online ##### -->
+<para>
+
+</para>
+
+ cal: 
+ is_online: 
+
+
+<!-- ##### FUNCTION e_data_cal_report_auth_required ##### -->
+<para>
+
+</para>
+
+ cal: 
+ credentials: 
+
+
+<!-- ##### FUNCTION e_data_cal_report_opened ##### -->
+<para>
+
+</para>
+
+ cal: 
+ error: 
+
+
+<!-- ##### FUNCTION e_data_cal_report_free_busy_data ##### -->
+<para>
+
+</para>
+
+ cal: 
+ freebusy: 
 
 
diff --git a/docs/reference/camel/camel-sections.txt b/docs/reference/camel/camel-sections.txt
index a67122c..7c429b3 100644
--- a/docs/reference/camel/camel-sections.txt
+++ b/docs/reference/camel/camel-sections.txt
@@ -198,6 +198,7 @@ camel_data_cache_add
 camel_data_cache_get
 camel_data_cache_remove
 camel_data_cache_get_filename
+camel_data_cache_clear
 <SUBSECTION Standard>
 CAMEL_DATA_CACHE
 CAMEL_IS_DATA_CACHE
@@ -545,6 +546,7 @@ camel_folder_search_execute_expression
 camel_folder_search_search
 camel_folder_search_count
 camel_folder_search_free_result
+camel_folder_search_util_add_months
 <SUBSECTION Standard>
 CAMEL_FOLDER_SEARCH
 CAMEL_IS_FOLDER_SEARCH
@@ -582,7 +584,6 @@ camel_folder_summary_next_uid_string
 camel_folder_summary_set_uid
 camel_folder_summary_save_to_db
 camel_folder_summary_load_from_db
-camel_folder_summary_header_load
 camel_folder_summary_header_load_from_db
 camel_folder_summary_header_save_to_db
 camel_folder_summary_touch
diff --git a/docs/reference/camel/tmpl/camel-cipher-context.sgml b/docs/reference/camel/tmpl/camel-cipher-context.sgml
index c581920..9d95899 100644
--- a/docs/reference/camel/tmpl/camel-cipher-context.sgml
+++ b/docs/reference/camel/tmpl/camel-cipher-context.sgml
@@ -750,6 +750,18 @@ 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:
+ 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-data-cache.sgml b/docs/reference/camel/tmpl/camel-data-cache.sgml
index 3319ad6..77fb7b2 100644
--- a/docs/reference/camel/tmpl/camel-data-cache.sgml
+++ b/docs/reference/camel/tmpl/camel-data-cache.sgml
@@ -125,3 +125,12 @@ CamelDataCache
 @Returns: 
 
 
+<!-- ##### FUNCTION camel_data_cache_clear ##### -->
+<para>
+
+</para>
+
+ cdc: 
+ path: 
+
+
diff --git a/docs/reference/camel/tmpl/camel-folder-search.sgml b/docs/reference/camel/tmpl/camel-folder-search.sgml
index 4e09440..a83ef64 100644
--- a/docs/reference/camel/tmpl/camel-folder-search.sgml
+++ b/docs/reference/camel/tmpl/camel-folder-search.sgml
@@ -113,3 +113,13 @@ CamelFolderSearch
 @Param2: 
 
 
+<!-- ##### FUNCTION camel_folder_search_util_add_months ##### -->
+<para>
+
+</para>
+
+ t: 
+ months: 
+ Returns: 
+
+
diff --git a/docs/reference/camel/tmpl/camel-unused.sgml b/docs/reference/camel/tmpl/camel-unused.sgml
index 24edac7..49e46c1 100644
--- a/docs/reference/camel/tmpl/camel-unused.sgml
+++ b/docs/reference/camel/tmpl/camel-unused.sgml
@@ -5247,16 +5247,6 @@ streams
 @error: 
 @Returns: 
 
-<!-- ##### FUNCTION camel_data_cache_clear ##### -->
-<para>
-
-</para>
-
- cache: 
- path: 
- ex: 
- Returns: 
-
 <!-- ##### FUNCTION camel_data_cache_rename ##### -->
 <para>
 
diff --git a/docs/reference/libebackend/libebackend-sections.txt b/docs/reference/libebackend/libebackend-sections.txt
index dcde70d..377ba14 100644
--- a/docs/reference/libebackend/libebackend-sections.txt
+++ b/docs/reference/libebackend/libebackend-sections.txt
@@ -80,3 +80,8 @@ EOfflineListenerClass
 EOfflineListenerPrivate
 e_offline_listener_get_type
 </SECTION>
+
+<SECTION>
+<FILE>e-sqlite3-vfs</FILE>
+e_sqlite3_vfs_init
+</SECTION>
diff --git a/docs/reference/libebackend/tmpl/e-sqlite3-vfs.sgml b/docs/reference/libebackend/tmpl/e-sqlite3-vfs.sgml
new file mode 100644
index 0000000..7261816
--- /dev/null
+++ b/docs/reference/libebackend/tmpl/e-sqlite3-vfs.sgml
@@ -0,0 +1,30 @@
+<!-- ##### SECTION Title ##### -->
+e-sqlite3-vfs
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### FUNCTION e_sqlite3_vfs_init ##### -->
+<para>
+
+</para>
+
+ void: 
+
+
diff --git a/docs/reference/libedataserver/Makefile.am b/docs/reference/libedataserver/Makefile.am
index 176a76c..a93fce2 100644
--- a/docs/reference/libedataserver/Makefile.am
+++ b/docs/reference/libedataserver/Makefile.am
@@ -13,7 +13,11 @@ DOC_SOURCE_DIR = $(top_srcdir)/libedataserver
 # Used for dependencies. The docs will be rebuilt if any of these change.
 HFILE_GLOB = $(top_srcdir)/libedataserver/*.h
 CFILE_GLOB = $(top_srcdir)/libedataserver/*.c
-IGNORE_HFILES = 			\
+
+IGNORE_HFILES = 					\
+	e-client-private.h				\
+	e-gdbus-marshallers.h				\
+	e-gdbus-templates.h				\
 	libedataserver-private.h
 
 GTKDOC_CFLAGS  =					\
diff --git a/docs/reference/libedataserver/libedataserver-docs.sgml b/docs/reference/libedataserver/libedataserver-docs.sgml
index dea882c..77c5181 100644
--- a/docs/reference/libedataserver/libedataserver-docs.sgml
+++ b/docs/reference/libedataserver/libedataserver-docs.sgml
@@ -13,12 +13,15 @@
     <xi:include href="xml/e-account.xml"/>
     <xi:include href="xml/e-account-list.xml"/>
     <xi:include href="xml/e-categories.xml"/>
+    <xi:include href="xml/e-client.xml"/>
+    <xi:include href="xml/e-credentials.xml"/>
     <xi:include href="xml/e-debug-log.xml"/>
     <xi:include href="xml/e-flag.xml"/>
     <xi:include href="xml/e-iterator.xml"/>
     <xi:include href="xml/e-list.xml"/>
     <xi:include href="xml/e-list-iterator.xml"/>
     <xi:include href="xml/e-memory.xml"/>
+    <xi:include href="xml/e-operation-pool.xml"/>
     <xi:include href="xml/e-proxy.xml"/>
     <xi:include href="xml/e-sexp.xml"/>
     <xi:include href="xml/e-source.xml"/>
diff --git a/docs/reference/libedataserver/libedataserver-sections.txt b/docs/reference/libedataserver/libedataserver-sections.txt
index e231bba..159b120 100644
--- a/docs/reference/libedataserver/libedataserver-sections.txt
+++ b/docs/reference/libedataserver/libedataserver-sections.txt
@@ -83,6 +83,111 @@ e_debug_log_clear
 </SECTION>
 
 <SECTION>
+<FILE>e-client</FILE>
+<TITLE>EClient</TITLE>
+E_CLIENT_ERROR
+EClientError
+e_client_error_to_string
+e_client_error_create
+CLIENT_BACKEND_PROPERTY_OPENED
+CLIENT_BACKEND_PROPERTY_OPENING
+CLIENT_BACKEND_PROPERTY_ONLINE
+CLIENT_BACKEND_PROPERTY_READONLY
+CLIENT_BACKEND_PROPERTY_CACHE_DIR
+CLIENT_BACKEND_PROPERTY_CAPABILITIES
+EClient
+e_client_get_source
+e_client_get_uri
+e_client_get_capabilities
+e_client_check_capability
+e_client_check_refresh_supported
+e_client_is_readonly
+e_client_is_online
+e_client_is_opened
+e_client_unwrap_dbus_error
+e_client_cancel_all
+e_client_get_backend_property
+e_client_get_backend_property_finish
+e_client_get_backend_property_sync
+e_client_set_backend_property
+e_client_set_backend_property_finish
+e_client_set_backend_property_sync
+e_client_open
+e_client_open_finish
+e_client_open_sync
+e_client_remove
+e_client_remove_finish
+e_client_remove_sync
+e_client_refresh
+e_client_refresh_finish
+e_client_refresh_sync
+e_client_retrieve_capabilities
+e_client_retrieve_capabilities_finish
+e_client_retrieve_capabilities_sync
+e_client_util_slist_to_strv
+e_client_util_strv_to_slist
+e_client_util_copy_string_slist
+e_client_util_copy_object_slist
+e_client_util_free_string_slist
+e_client_util_free_object_slist
+e_client_util_parse_comma_strings
+EClientErrorsList
+e_client_util_unwrap_dbus_error
+<SUBSECTION Standard>
+E_CLIENT
+E_IS_CLIENT
+E_TYPE_CLIENT
+E_CLIENT_CLASS
+E_IS_CLIENT_CLASS
+E_CLIENT_GET_CLASS
+EClientClass
+e_client_get_type
+<SUBSECTION Private>
+EClientPrivate
+e_client_error_quark
+</SECTION>
+
+<SECTION>
+<FILE>e-credentials</FILE>
+<TITLE>ECredentials</TITLE>
+ECredentials
+E_CREDENTIALS_KEY_USERNAME
+E_CREDENTIALS_KEY_PASSWORD
+E_CREDENTIALS_KEY_AUTH_METHOD
+E_CREDENTIALS_KEY_AUTH_DOMAIN
+E_CREDENTIALS_KEY_PROMPT_TITLE
+E_CREDENTIALS_KEY_PROMPT_TEXT
+E_CREDENTIALS_KEY_PROMPT_REASON
+E_CREDENTIALS_KEY_PROMPT_KEY
+E_CREDENTIALS_KEY_PROMPT_FLAGS
+E_CREDENTIALS_AUTH_DOMAIN_ADDRESSBOOK
+E_CREDENTIALS_AUTH_DOMAIN_CALENDAR
+E_CREDENTIALS_AUTH_DOMAIN_MAIL
+ECredentialsPromptFlags
+e_credentials_new
+e_credentials_new_strv
+e_credentials_new_args
+e_credentials_new_clone
+e_credentials_free
+e_credentials_to_strv
+e_credentials_set
+e_credentials_get
+e_credentials_peek
+e_credentials_equal
+e_credentials_equal_keys
+e_credentials_has_key
+e_credentials_keys_size
+e_credentials_list_keys
+e_credentials_clear
+e_credentials_clear_peek
+e_credentials_util_safe_free_string
+e_credentials_util_prompt_flags_to_string
+e_credentials_util_string_to_prompt_flags
+<SUBSECTION Private>
+ECredentialsPrivate
+</SECTION>
+
+<SECTION>
 <FILE>e-flag</FILE>
 <TITLE>EFlag</TITLE>
 EFlag
@@ -167,6 +272,16 @@ e_list_iterator_get_type
 </SECTION>
 
 <SECTION>
+<FILE>e-operation-pool</FILE>
+<TITLE>EOperationPool</TITLE>
+e_operation_pool_new
+e_operation_pool_free
+e_operation_pool_reserve_opid
+e_operation_pool_release_opid
+e_operation_pool_push
+</SECTION>
+
+<SECTION>
 <FILE>e-proxy</FILE>
 <TITLE>EProxy</TITLE>
 EProxy
@@ -436,6 +551,10 @@ e_util_get_localedir
 e_util_replace_prefix
 e_data_server_util_get_dbus_call_timeout
 e_data_server_util_set_dbus_call_timeout
+e_pointer_tracker_track
+e_pointer_tracker_track_with_info
+e_pointer_tracker_untrack
+e_pointer_tracker_dump
 </SECTION>
 
 <SECTION>
diff --git a/docs/reference/libedataserver/libedataserver.types b/docs/reference/libedataserver/libedataserver.types
index 4fd51b5..e6aea8a 100644
--- a/docs/reference/libedataserver/libedataserver.types
+++ b/docs/reference/libedataserver/libedataserver.types
@@ -1,5 +1,6 @@
 #include <libedataserver/e-account.h>
 #include <libedataserver/e-account-list.h>
+#include <libedataserver/e-client.h>
 #include <libedataserver/e-iterator.h>
 #include <libedataserver/e-list.h>
 #include <libedataserver/e-list-iterator.h>
@@ -10,6 +11,7 @@
 
 e_account_get_type
 e_account_list_get_type
+e_client_get_type
 e_iterator_get_type
 e_list_get_type
 e_list_iterator_get_type
diff --git a/docs/reference/libedataserver/tmpl/e-client.sgml b/docs/reference/libedataserver/tmpl/e-client.sgml
new file mode 100644
index 0000000..54c20f9
--- /dev/null
+++ b/docs/reference/libedataserver/tmpl/e-client.sgml
@@ -0,0 +1,565 @@
+<!-- ##### SECTION Title ##### -->
+EClient
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### MACRO E_CLIENT_ERROR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### ENUM EClientError ##### -->
+<para>
+
+</para>
+
+ E_CLIENT_ERROR_INVALID_ARG: 
+ E_CLIENT_ERROR_BUSY: 
+ E_CLIENT_ERROR_SOURCE_NOT_LOADED: 
+ E_CLIENT_ERROR_SOURCE_ALREADY_LOADED: 
+ E_CLIENT_ERROR_AUTHENTICATION_FAILED: 
+ E_CLIENT_ERROR_AUTHENTICATION_REQUIRED: 
+ E_CLIENT_ERROR_REPOSITORY_OFFLINE: 
+ E_CLIENT_ERROR_OFFLINE_UNAVAILABLE: 
+ E_CLIENT_ERROR_PERMISSION_DENIED: 
+ E_CLIENT_ERROR_CANCELLED: 
+ E_CLIENT_ERROR_COULD_NOT_CANCEL: 
+ E_CLIENT_ERROR_NOT_SUPPORTED: 
+ E_CLIENT_ERROR_TLS_NOT_AVAILABLE: 
+ E_CLIENT_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD: 
+ E_CLIENT_ERROR_SEARCH_SIZE_LIMIT_EXCEEDED: 
+ E_CLIENT_ERROR_SEARCH_TIME_LIMIT_EXCEEDED: 
+ E_CLIENT_ERROR_INVALID_QUERY: 
+ E_CLIENT_ERROR_QUERY_REFUSED: 
+ E_CLIENT_ERROR_DBUS_ERROR: 
+ E_CLIENT_ERROR_OTHER_ERROR: 
+
+<!-- ##### FUNCTION e_client_error_to_string ##### -->
+<para>
+
+</para>
+
+ code: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_error_create ##### -->
+<para>
+
+</para>
+
+ code: 
+ custom_msg: 
+ Returns: 
+
+
+<!-- ##### MACRO CLIENT_BACKEND_PROPERTY_OPENED ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CLIENT_BACKEND_PROPERTY_OPENING ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CLIENT_BACKEND_PROPERTY_ONLINE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CLIENT_BACKEND_PROPERTY_READONLY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CLIENT_BACKEND_PROPERTY_CACHE_DIR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO CLIENT_BACKEND_PROPERTY_CAPABILITIES ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### STRUCT EClient ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SIGNAL EClient::authenticate ##### -->
+<para>
+
+</para>
+
+ eclient: the object which received the signal.
+ arg1: 
+ Returns: 
+
+<!-- ##### SIGNAL EClient::backend-died ##### -->
+<para>
+
+</para>
+
+ eclient: the object which received the signal.
+
+<!-- ##### SIGNAL EClient::backend-error ##### -->
+<para>
+
+</para>
+
+ eclient: the object which received the signal.
+ arg1: 
+
+<!-- ##### SIGNAL EClient::opened ##### -->
+<para>
+
+</para>
+
+ eclient: the object which received the signal.
+ arg1: 
+
+<!-- ##### ARG EClient:capabilities ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG EClient:online ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG EClient:opened ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG EClient:readonly ##### -->
+<para>
+
+</para>
+
+<!-- ##### ARG EClient:source ##### -->
+<para>
+
+</para>
+
+<!-- ##### FUNCTION e_client_get_source ##### -->
+<para>
+
+</para>
+
+ client: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_get_uri ##### -->
+<para>
+
+</para>
+
+ client: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_get_capabilities ##### -->
+<para>
+
+</para>
+
+ client: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_check_capability ##### -->
+<para>
+
+</para>
+
+ client: 
+ capability: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_check_refresh_supported ##### -->
+<para>
+
+</para>
+
+ client: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_is_readonly ##### -->
+<para>
+
+</para>
+
+ client: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_is_online ##### -->
+<para>
+
+</para>
+
+ client: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_is_opened ##### -->
+<para>
+
+</para>
+
+ client: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_unwrap_dbus_error ##### -->
+<para>
+
+</para>
+
+ client: 
+ dbus_error: 
+ out_error: 
+
+
+<!-- ##### FUNCTION e_client_cancel_all ##### -->
+<para>
+
+</para>
+
+ client: 
+
+
+<!-- ##### FUNCTION e_client_get_backend_property ##### -->
+<para>
+
+</para>
+
+ client: 
+ prop_name: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_client_get_backend_property_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ prop_value: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_get_backend_property_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ prop_name: 
+ prop_value: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_set_backend_property ##### -->
+<para>
+
+</para>
+
+ client: 
+ prop_name: 
+ prop_value: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_client_set_backend_property_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_set_backend_property_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ prop_name: 
+ prop_value: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_open ##### -->
+<para>
+
+</para>
+
+ client: 
+ only_if_exists: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_client_open_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_open_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ only_if_exists: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_remove ##### -->
+<para>
+
+</para>
+
+ client: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_client_remove_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_remove_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_refresh ##### -->
+<para>
+
+</para>
+
+ client: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_client_refresh_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_refresh_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_retrieve_capabilities ##### -->
+<para>
+
+</para>
+
+ client: 
+ cancellable: 
+ callback: 
+ user_data: 
+
+
+<!-- ##### FUNCTION e_client_retrieve_capabilities_finish ##### -->
+<para>
+
+</para>
+
+ client: 
+ result: 
+ capabilities: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_retrieve_capabilities_sync ##### -->
+<para>
+
+</para>
+
+ client: 
+ capabilities: 
+ cancellable: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_util_slist_to_strv ##### -->
+<para>
+
+</para>
+
+ strings: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_util_strv_to_slist ##### -->
+<para>
+
+</para>
+
+ strv: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_util_copy_string_slist ##### -->
+<para>
+
+</para>
+
+ copy_to: 
+ strings: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_util_copy_object_slist ##### -->
+<para>
+
+</para>
+
+ copy_to: 
+ objects: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_util_free_string_slist ##### -->
+<para>
+
+</para>
+
+ strings: 
+
+
+<!-- ##### FUNCTION e_client_util_free_object_slist ##### -->
+<para>
+
+</para>
+
+ objects: 
+
+
+<!-- ##### FUNCTION e_client_util_parse_comma_strings ##### -->
+<para>
+
+</para>
+
+ strings: 
+ Returns: 
+
+
+<!-- ##### STRUCT EClientErrorsList ##### -->
+<para>
+
+</para>
+
+ name: 
+ err_code: 
+
+<!-- ##### FUNCTION e_client_util_unwrap_dbus_error ##### -->
+<para>
+
+</para>
+
+ dbus_error: 
+ client_error: 
+ known_errors: 
+ known_errors_count: 
+ known_errors_domain: 
+ fail_when_none_matched: 
+ Returns: 
+
+
diff --git a/docs/reference/libedataserver/tmpl/e-credentials.sgml b/docs/reference/libedataserver/tmpl/e-credentials.sgml
new file mode 100644
index 0000000..a78b1fb
--- /dev/null
+++ b/docs/reference/libedataserver/tmpl/e-credentials.sgml
@@ -0,0 +1,304 @@
+<!-- ##### SECTION Title ##### -->
+ECredentials
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### STRUCT ECredentials ##### -->
+<para>
+
+</para>
+
+ priv: 
+
+<!-- ##### MACRO E_CREDENTIALS_KEY_USERNAME ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO E_CREDENTIALS_KEY_PASSWORD ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO E_CREDENTIALS_KEY_AUTH_METHOD ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO E_CREDENTIALS_KEY_AUTH_DOMAIN ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO E_CREDENTIALS_KEY_PROMPT_TITLE ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO E_CREDENTIALS_KEY_PROMPT_TEXT ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO E_CREDENTIALS_KEY_PROMPT_REASON ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO E_CREDENTIALS_KEY_PROMPT_KEY ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO E_CREDENTIALS_KEY_PROMPT_FLAGS ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO E_CREDENTIALS_AUTH_DOMAIN_ADDRESSBOOK ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO E_CREDENTIALS_AUTH_DOMAIN_CALENDAR ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### MACRO E_CREDENTIALS_AUTH_DOMAIN_MAIL ##### -->
+<para>
+
+</para>
+
+
+
+<!-- ##### ENUM ECredentialsPromptFlags ##### -->
+<para>
+
+</para>
+
+ E_CREDENTIALS_PROMPT_FLAG_REMEMBER_NEVER: 
+ E_CREDENTIALS_PROMPT_FLAG_REMEMBER_SESSION: 
+ E_CREDENTIALS_PROMPT_FLAG_REMEMBER_FOREVER: 
+ E_CREDENTIALS_PROMPT_FLAG_REMEMBER_MASK: 
+ E_CREDENTIALS_PROMPT_FLAG_SECRET: 
+ E_CREDENTIALS_PROMPT_FLAG_REPROMPT: 
+ E_CREDENTIALS_PROMPT_FLAG_ONLINE: 
+ E_CREDENTIALS_PROMPT_FLAG_DISABLE_REMEMBER: 
+ E_CREDENTIALS_PROMPT_FLAG_PASSPHRASE: 
+
+<!-- ##### FUNCTION e_credentials_new ##### -->
+<para>
+
+</para>
+
+ void: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_credentials_new_strv ##### -->
+<para>
+
+</para>
+
+ strv: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_credentials_new_args ##### -->
+<para>
+
+</para>
+
+ key: 
+ Varargs: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_credentials_new_clone ##### -->
+<para>
+
+</para>
+
+ credentials: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_credentials_free ##### -->
+<para>
+
+</para>
+
+ credentials: 
+
+
+<!-- ##### FUNCTION e_credentials_to_strv ##### -->
+<para>
+
+</para>
+
+ credentials: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_credentials_set ##### -->
+<para>
+
+</para>
+
+ credentials: 
+ key: 
+ value: 
+
+
+<!-- ##### FUNCTION e_credentials_get ##### -->
+<para>
+
+</para>
+
+ credentials: 
+ key: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_credentials_peek ##### -->
+<para>
+
+</para>
+
+ credentials: 
+ key: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_credentials_equal ##### -->
+<para>
+
+</para>
+
+ credentials1: 
+ credentials2: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_credentials_equal_keys ##### -->
+<para>
+
+</para>
+
+ credentials1: 
+ credentials2: 
+ key1: 
+ Varargs: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_credentials_has_key ##### -->
+<para>
+
+</para>
+
+ credentials: 
+ key: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_credentials_keys_size ##### -->
+<para>
+
+</para>
+
+ credentials: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_credentials_list_keys ##### -->
+<para>
+
+</para>
+
+ credentials: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_credentials_clear ##### -->
+<para>
+
+</para>
+
+ credentials: 
+
+
+<!-- ##### FUNCTION e_credentials_clear_peek ##### -->
+<para>
+
+</para>
+
+ credentials: 
+
+
+<!-- ##### FUNCTION e_credentials_util_safe_free_string ##### -->
+<para>
+
+</para>
+
+ str: 
+
+
+<!-- ##### FUNCTION e_credentials_util_prompt_flags_to_string ##### -->
+<para>
+
+</para>
+
+ prompt_flags: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_credentials_util_string_to_prompt_flags ##### -->
+<para>
+
+</para>
+
+ prompt_flags_string: 
+ Returns: 
+
+
diff --git a/docs/reference/libedataserver/tmpl/e-operation-pool.sgml b/docs/reference/libedataserver/tmpl/e-operation-pool.sgml
new file mode 100644
index 0000000..a8854d1
--- /dev/null
+++ b/docs/reference/libedataserver/tmpl/e-operation-pool.sgml
@@ -0,0 +1,68 @@
+<!-- ##### SECTION Title ##### -->
+EOperationPool
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### FUNCTION e_operation_pool_new ##### -->
+<para>
+
+</para>
+
+ max_threads: 
+ thread_func: 
+ user_data: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_operation_pool_free ##### -->
+<para>
+
+</para>
+
+ pool: 
+
+
+<!-- ##### FUNCTION e_operation_pool_reserve_opid ##### -->
+<para>
+
+</para>
+
+ pool: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_operation_pool_release_opid ##### -->
+<para>
+
+</para>
+
+ pool: 
+ opid: 
+
+
+<!-- ##### FUNCTION e_operation_pool_push ##### -->
+<para>
+
+</para>
+
+ pool: 
+ data: 
+
+
diff --git a/docs/reference/libedataserver/tmpl/e-util.sgml b/docs/reference/libedataserver/tmpl/e-util.sgml
index 4062e9a..43721f7 100644
--- a/docs/reference/libedataserver/tmpl/e-util.sgml
+++ b/docs/reference/libedataserver/tmpl/e-util.sgml
@@ -227,3 +227,36 @@ Miscellaneous utility functions for evolution-data-server.
 @timeout_msec: 
 
 
+<!-- ##### MACRO e_pointer_tracker_track ##### -->
+<para>
+
+</para>
+
+ ptr: 
+
+
+<!-- ##### FUNCTION e_pointer_tracker_track_with_info ##### -->
+<para>
+
+</para>
+
+ ptr: 
+ info: 
+
+
+<!-- ##### FUNCTION e_pointer_tracker_untrack ##### -->
+<para>
+
+</para>
+
+ ptr: 
+
+
+<!-- ##### FUNCTION e_pointer_tracker_dump ##### -->
+<para>
+
+</para>
+
+ void: 
+
+
diff --git a/docs/reference/libedataserverui/libedataserverui-docs.sgml b/docs/reference/libedataserverui/libedataserverui-docs.sgml
index caf9451..c25bd14 100644
--- a/docs/reference/libedataserverui/libedataserverui-docs.sgml
+++ b/docs/reference/libedataserverui/libedataserverui-docs.sgml
@@ -17,6 +17,7 @@
     <xi:include href="xml/e-category-editor.xml"/>
     <xi:include href="xml/e-category-completion.xml"/>
     <xi:include href="xml/e-cell-renderer-color.xml"/>
+    <xi:include href="xml/e-client-utils.xml"/>
     <xi:include href="xml/e-contact-store.xml"/>
     <xi:include href="xml/e-data-server-ui-marshal.xml"/>
     <xi:include href="xml/e-destination-store.xml"/>
diff --git a/docs/reference/libedataserverui/libedataserverui-sections.txt b/docs/reference/libedataserverui/libedataserverui-sections.txt
index e703f1c..af8675c 100644
--- a/docs/reference/libedataserverui/libedataserverui-sections.txt
+++ b/docs/reference/libedataserverui/libedataserverui-sections.txt
@@ -128,19 +128,38 @@ e_cell_renderer_color_get_type
 </SECTION>
 
 <SECTION>
+<FILE>e-client-utils</FILE>
+<TITLE>EClient Utilities</TITLE>
+EClientSourceType
+EClientUtilsAuthenticateHandler
+e_client_utils_new
+e_client_utils_new_from_uri
+e_client_utils_new_system
+e_client_utils_new_default
+e_client_utils_set_default
+e_client_utils_set_default_source
+e_client_utils_get_sources
+e_client_utils_open_new
+e_client_utils_open_new_finish
+e_client_utils_authenticate_handler
+e_client_utils_forget_password
+e_credentials_authenticate_helper
+e_credentials_forget_password
+</SECTION>
+
+<SECTION>
 <FILE>e-contact-store</FILE>
 <TITLE>EContactStore</TITLE>
 EContactStore
 e_contact_store_new
-e_contact_store_get_book
+e_contact_store_get_client
 e_contact_store_get_contact
 e_contact_store_find_contact
-e_contact_store_get_books
-e_contact_store_add_book
-e_contact_store_remove_book
+e_contact_store_get_clients
+e_contact_store_add_client
+e_contact_store_remove_client
 e_contact_store_set_query
 e_contact_store_peek_query
-find_contact_source_by_book_return_view
 <SUBSECTION Standard>
 E_CONTACT_STORE
 E_IS_CONTACT_STORE
@@ -192,6 +211,8 @@ e_name_selector_peek_dialog
 e_name_selector_peek_section_entry
 e_name_selector_peek_section_list
 e_name_selector_show_dialog
+e_name_selector_load_books
+e_name_selector_cancel_loading
 <SUBSECTION Standard>
 E_NAME_SELECTOR
 E_IS_NAME_SELECTOR
@@ -213,6 +234,7 @@ e_name_selector_dialog_new
 e_name_selector_dialog_peek_model
 e_name_selector_dialog_set_model
 e_name_selector_dialog_set_destination_index
+e_name_selector_dialog_set_scrolling_policy
 <SUBSECTION Standard>
 E_NAME_SELECTOR_DIALOG
 E_IS_NAME_SELECTOR_DIALOG
diff --git a/docs/reference/libedataserverui/tmpl/e-client-utils.sgml b/docs/reference/libedataserverui/tmpl/e-client-utils.sgml
new file mode 100644
index 0000000..5d6c50e
--- /dev/null
+++ b/docs/reference/libedataserverui/tmpl/e-client-utils.sgml
@@ -0,0 +1,184 @@
+<!-- ##### SECTION Title ##### -->
+EClient Utilities
+
+<!-- ##### SECTION Short_Description ##### -->
+
+
+<!-- ##### SECTION Long_Description ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION See_Also ##### -->
+<para>
+
+</para>
+
+<!-- ##### SECTION Stability_Level ##### -->
+
+
+<!-- ##### SECTION Image ##### -->
+
+
+<!-- ##### ENUM EClientSourceType ##### -->
+<para>
+
+</para>
+
+ E_CLIENT_SOURCE_TYPE_CONTACTS: 
+ E_CLIENT_SOURCE_TYPE_EVENTS: 
+ E_CLIENT_SOURCE_TYPE_MEMOS: 
+ E_CLIENT_SOURCE_TYPE_TASKS: 
+ E_CLIENT_SOURCE_TYPE_LAST: 
+
+<!-- ##### USER_FUNCTION EClientUtilsAuthenticateHandler ##### -->
+<para>
+
+</para>
+
+ client: 
+ credentials: 
+ user_data: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_utils_new ##### -->
+<para>
+
+</para>
+
+ source: 
+ source_type: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_utils_new_from_uri ##### -->
+<para>
+
+</para>
+
+ uri: 
+ source_type: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_utils_new_system ##### -->
+<para>
+
+</para>
+
+ source_type: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_utils_new_default ##### -->
+<para>
+
+</para>
+
+ source_type: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_utils_set_default ##### -->
+<para>
+
+</para>
+
+ client: 
+ source_type: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_utils_set_default_source ##### -->
+<para>
+
+</para>
+
+ source: 
+ source_type: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_utils_get_sources ##### -->
+<para>
+
+</para>
+
+ sources: 
+ source_type: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_utils_open_new ##### -->
+<para>
+
+</para>
+
+ source: 
+ source_type: 
+ only_if_exists: 
+ cancellable: 
+ auth_handler: 
+ auth_handler_user_data: 
+ async_cb: 
+ async_cb_user_data: 
+
+
+<!-- ##### FUNCTION e_client_utils_open_new_finish ##### -->
+<para>
+
+</para>
+
+ source: 
+ result: 
+ client: 
+ error: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_utils_authenticate_handler ##### -->
+<para>
+
+</para>
+
+ client: 
+ credentials: 
+ gtk_window_parent: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_client_utils_forget_password ##### -->
+<para>
+
+</para>
+
+ client: 
+
+
+<!-- ##### FUNCTION e_credentials_authenticate_helper ##### -->
+<para>
+
+</para>
+
+ credentials: 
+ parent: 
+ remember_password: 
+ Returns: 
+
+
+<!-- ##### FUNCTION e_credentials_forget_password ##### -->
+<para>
+
+</para>
+
+ credentials: 
+
+
diff --git a/docs/reference/libedataserverui/tmpl/e-contact-store.sgml b/docs/reference/libedataserverui/tmpl/e-contact-store.sgml
index c173533..18d2ca7 100644
--- a/docs/reference/libedataserverui/tmpl/e-contact-store.sgml
+++ b/docs/reference/libedataserverui/tmpl/e-contact-store.sgml
@@ -26,6 +26,22 @@ EContactStore
 </para>
 
 
+<!-- ##### SIGNAL EContactStore::start-client-view ##### -->
+<para>
+
+</para>
+
+ econtactstore: the object which received the signal.
+ arg1: 
+
+<!-- ##### SIGNAL EContactStore::stop-client-view ##### -->
+<para>
+
+</para>
+
+ econtactstore: the object which received the signal.
+ arg1: 
+
 <!-- ##### FUNCTION e_contact_store_new ##### -->
 <para>
 
@@ -35,7 +51,7 @@ EContactStore
 @Returns: 
 
 
-<!-- ##### FUNCTION e_contact_store_get_book ##### -->
+<!-- ##### FUNCTION e_contact_store_get_client ##### -->
 <para>
 
 </para>
@@ -66,7 +82,7 @@ EContactStore
 @Returns: 
 
 
-<!-- ##### FUNCTION e_contact_store_get_books ##### -->
+<!-- ##### FUNCTION e_contact_store_get_clients ##### -->
 <para>
 
 </para>
@@ -75,22 +91,22 @@ EContactStore
 @Returns: 
 
 
-<!-- ##### FUNCTION e_contact_store_add_book ##### -->
+<!-- ##### FUNCTION e_contact_store_add_client ##### -->
 <para>
 
 </para>
 
 @contact_store: 
- book: 
+ book_client: 
 
 
-<!-- ##### FUNCTION e_contact_store_remove_book ##### -->
+<!-- ##### FUNCTION e_contact_store_remove_client ##### -->
 <para>
 
 </para>
 
 @contact_store: 
- book: 
+ book_client: 
 
 
 <!-- ##### FUNCTION e_contact_store_set_query ##### -->
@@ -111,13 +127,3 @@ EContactStore
 @Returns: 
 
 
-<!-- ##### FUNCTION find_contact_source_by_book_return_view ##### -->
-<para>
-
-</para>
-
- contact_store: 
- book: 
- Returns: 
-
-
diff --git a/docs/reference/libedataserverui/tmpl/e-name-selector-dialog.sgml b/docs/reference/libedataserverui/tmpl/e-name-selector-dialog.sgml
index 109b75b..a08e16c 100644
--- a/docs/reference/libedataserverui/tmpl/e-name-selector-dialog.sgml
+++ b/docs/reference/libedataserverui/tmpl/e-name-selector-dialog.sgml
@@ -62,3 +62,13 @@ ENameSelectorDialog
 @index: 
 
 
+<!-- ##### FUNCTION e_name_selector_dialog_set_scrolling_policy ##### -->
+<para>
+
+</para>
+
+ name_selector_dialog: 
+ hscrollbar_policy: 
+ vscrollbar_policy: 
+
+
diff --git a/docs/reference/libedataserverui/tmpl/e-name-selector.sgml b/docs/reference/libedataserverui/tmpl/e-name-selector.sgml
index f6a617d..bf4f452 100644
--- a/docs/reference/libedataserverui/tmpl/e-name-selector.sgml
+++ b/docs/reference/libedataserverui/tmpl/e-name-selector.sgml
@@ -82,3 +82,19 @@ ENameSelector
 @for_transient_widget: 
 
 
+<!-- ##### FUNCTION e_name_selector_load_books ##### -->
+<para>
+
+</para>
+
+ name_selector: 
+
+
+<!-- ##### FUNCTION e_name_selector_cancel_loading ##### -->
+<para>
+
+</para>
+
+ name_selector: 
+
+
diff --git a/docs/reference/libedataserverui/tmpl/libedataserverui-unused.sgml b/docs/reference/libedataserverui/tmpl/libedataserverui-unused.sgml
index f6617e0..5be9944 100644
--- a/docs/reference/libedataserverui/tmpl/libedataserverui-unused.sgml
+++ b/docs/reference/libedataserverui/tmpl/libedataserverui-unused.sgml
@@ -94,6 +94,39 @@ ESourceOptionMenu
 </para>
 
 
+<!-- ##### FUNCTION e_contact_store_add_book ##### -->
+<para>
+
+</para>
+
+ contact_store: 
+ book: 
+
+<!-- ##### FUNCTION e_contact_store_get_book ##### -->
+<para>
+
+</para>
+
+ contact_store: 
+ iter: 
+ Returns: 
+
+<!-- ##### FUNCTION e_contact_store_get_books ##### -->
+<para>
+
+</para>
+
+ contact_store: 
+ Returns: 
+
+<!-- ##### FUNCTION e_contact_store_remove_book ##### -->
+<para>
+
+</para>
+
+ contact_store: 
+ book: 
+
 <!-- ##### FUNCTION e_data_server_ui_marshal_BOOLEAN__BOXED_OBJECT_FLAGS_UINT ##### -->
 <para>
 
@@ -176,3 +209,12 @@ ESourceOptionMenu
 @menu: 
 @source: 
 
+<!-- ##### FUNCTION find_contact_source_by_book_return_view ##### -->
+<para>
+
+</para>
+
+ contact_store: 
+ book: 
+ Returns: 
+
diff --git a/libedataserver/e-client.h b/libedataserver/e-client.h
index 3b5644f..1615e49 100644
--- a/libedataserver/e-client.h
+++ b/libedataserver/e-client.h
@@ -170,12 +170,14 @@ void		e_client_util_free_string_slist		(GSList *strings);
 void		e_client_util_free_object_slist		(GSList *objects);
 GSList *	e_client_util_parse_comma_strings	(const gchar *strings);
 
-struct EClientErrorsList {
+typedef struct _EClientErrorsList EClientErrorsList;
+
+struct _EClientErrorsList {
 	const gchar *name;
 	gint err_code;
 };
 
-gboolean	e_client_util_unwrap_dbus_error		(GError *dbus_error, GError **client_error, const struct EClientErrorsList *known_errors, guint known_errors_count, GQuark known_errors_domain, gboolean fail_when_none_matched);
+gboolean	e_client_util_unwrap_dbus_error		(GError *dbus_error, GError **client_error, const EClientErrorsList *known_errors, guint known_errors_count, GQuark known_errors_domain, gboolean fail_when_none_matched);
 
 G_END_DECLS
 
diff --git a/libedataserver/e-credentials.h b/libedataserver/e-credentials.h
index ebd32c7..85812e0 100644
--- a/libedataserver/e-credentials.h
+++ b/libedataserver/e-credentials.h
@@ -26,12 +26,12 @@
 
 G_BEGIN_DECLS
 
+typedef struct _ECredentials ECredentials;
 typedef struct _ECredentialsPrivate ECredentialsPrivate;
 
-typedef struct _ECredentials
-{
+struct _ECredentials {
 	ECredentialsPrivate *priv;
-} ECredentials;
+};
 
 #define E_CREDENTIALS_KEY_USERNAME	"username"
 #define E_CREDENTIALS_KEY_PASSWORD	"password"



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