GNOME.org
 

[evolution-data-server] Fix some linker issues.

commit 20f6a2c17fbad0e15db0b583e3d6c21e260f761a
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Jul 10 23:30:06 2010 -0400

    Fix some linker issues.

 addressbook/libedata-book/Makefile.am              |    5 +-
 addressbook/tests/vcard/Makefile.am                |    1 +
 calendar/libedata-cal/Makefile.am                  |    7 +-
 calendar/tests/ecal/Makefile.am                    |   85 ++++++++++----------
 docs/reference/addressbook/libebook/Makefile.am    |    1 +
 .../addressbook/libebook/tmpl/e-book-types.sgml    |    3 +-
 .../addressbook/libebook/tmpl/e-book-view.sgml     |    9 ++
 .../addressbook/libedata-book/Makefile.am          |    1 +
 .../libedata-book/tmpl/e-book-backend-sync.sgml    |   28 +++----
 .../libedata-book/tmpl/e-book-backend.sgml         |    4 +-
 .../libedata-book/tmpl/e-data-book-view.sgml       |    3 +-
 .../libedata-book/tmpl/e-data-book.sgml            |   24 +++---
 .../libedata-book/tmpl/libedata-book-unused.sgml   |    6 ++
 docs/reference/calendar/libecal/Makefile.am        |    1 +
 .../libecal/tmpl/e-cal-check-timezones.sgml        |    1 +
 .../calendar/libecal/tmpl/e-cal-types.sgml         |    3 +-
 .../calendar/libecal/tmpl/e-cal-view.sgml          |    9 ++
 docs/reference/calendar/libecal/tmpl/e-cal.sgml    |    8 ++
 docs/reference/calendar/libedata-cal/Makefile.am   |    1 +
 .../libedata-cal/tmpl/e-cal-backend-sync.sgml      |   54 ++++++-------
 .../libedata-cal/tmpl/e-cal-backend-util.sgml      |    9 --
 .../calendar/libedata-cal/tmpl/e-cal-backend.sgml  |   18 +----
 .../libedata-cal/tmpl/e-data-cal-view.sgml         |   11 +---
 .../calendar/libedata-cal/tmpl/e-data-cal.sgml     |   48 ++++++------
 .../reference/camel/tmpl/camel-cipher-context.sgml |    2 +
 docs/reference/libedataserverui/Makefile.am        |    2 +
 26 files changed, 175 insertions(+), 169 deletions(-)
---
diff --git a/addressbook/libedata-book/Makefile.am b/addressbook/libedata-book/Makefile.am
index cab814c..26351b0 100644
--- a/addressbook/libedata-book/Makefile.am
+++ b/addressbook/libedata-book/Makefile.am
@@ -84,8 +84,9 @@ e_addressbook_factory_CPPFLAGS = \
 
 e_addressbook_factory_SOURCES = e-data-book-factory.c e-data-book-factory.h
 
-e_addressbook_factory_LDADD =				\
-	libedata-book-1.2.la				\
+e_addressbook_factory_LDADD =					\
+	libedata-book-1.2.la					\
+	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
 	$(top_builddir)/libebackend/libebackend-1.2.la
 
 %-$(API_VERSION).pc: %.pc
diff --git a/addressbook/tests/vcard/Makefile.am b/addressbook/tests/vcard/Makefile.am
index a89f0ff..7b1832a 100644
--- a/addressbook/tests/vcard/Makefile.am
+++ b/addressbook/tests/vcard/Makefile.am
@@ -9,6 +9,7 @@ dump_vcard_CPPFLAGS = \
 
 dump_vcard_LDADD = 						\
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
+	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
 EXTRA_DIST=1.vcf 2.vcf 3.vcf 4.vcf 5.vcf 6.vcf 7.vcf 8.vcf 9.vcf 10.vcf 11.vcf
diff --git a/calendar/libedata-cal/Makefile.am b/calendar/libedata-cal/Makefile.am
index 694c4af..c32c681 100644
--- a/calendar/libedata-cal/Makefile.am
+++ b/calendar/libedata-cal/Makefile.am
@@ -100,6 +100,7 @@ e_calendar_factory_SOURCES = \
 	e-data-cal-factory.h \
 	e-cal-backend-loader-factory.c \
 	e-cal-backend-loader-factory.h
+
 e_calendar_factory_CPPFLAGS = \
 	$(AM_CPPFLAGS)					\
 	-DG_LOG_DOMAIN=\"libedata-cal\"			\
@@ -111,8 +112,10 @@ e_calendar_factory_CPPFLAGS = \
 	-I$(top_builddir)/calendar			\
 	$(LIBICAL_CFLAGS)				\
 	$(EVOLUTION_CALENDAR_CFLAGS)
-e_calendar_factory_LDADD =				\
-	$(builddir)/libedata-cal-1.2.la			\
+
+e_calendar_factory_LDADD =					\
+	$(builddir)/libedata-cal-1.2.la				\
+	$(top_builddir)/libedataserver/libedataserver-1.2.la 	\
 	$(top_builddir)/libebackend/libebackend-1.2.la
 
 -include $(top_srcdir)/git.mk
diff --git a/calendar/tests/ecal/Makefile.am b/calendar/tests/ecal/Makefile.am
index a7f142f..e1fbff0 100644
--- a/calendar/tests/ecal/Makefile.am
+++ b/calendar/tests/ecal/Makefile.am
@@ -13,14 +13,14 @@ libecal_test_utils_la_CPPFLAGS = \
 	$(NULL)
 
 libecal_test_utils_la_LIBADD = \
-        $(top_builddir)/calendar/libecal/libecal-1.2.la    \
-        $(EVOLUTION_CALENDAR_LIBS)                         \
-        $(NULL)
+	$(top_builddir)/calendar/libecal/libecal-1.2.la		\
+	$(EVOLUTION_CALENDAR_LIBS)				\
+	$(NULL)
 
 TEST_ECAL_LIBS = \
-        $(libecal_test_utils_la_LIBADD) \
-        libecal-test-utils.la           \
-        $(NULL)
+	$(libecal_test_utils_la_LIBADD) \
+	libecal-test-utils.la           \
+	$(NULL)
 
 EXTRA_DIST =                          \
 	$(test_scripts)               \
@@ -32,32 +32,32 @@ test_scripts =                         \
 
 # ordered by relative complexity
 TESTS = \
-        test-ecal-remove			\
-        test-ecal-open				\
-        test-ecal-get-free-busy			\
-        test-ecal-get-timezone			\
-        test-ecal-add-timezone			\
-        test-ecal-set-default-timezone		\
-        test-ecal-get-alarm-email-address	\
-        test-ecal-get-cal-address		\
-        test-ecal-get-ldap-attribute		\
-        test-ecal-get-capabilities		\
-        test-ecal-get-default-object		\
-        test-ecal-set-mode			\
-        test-ecal-create-object			\
-        test-ecal-create-object--2		\
-        test-ecal-get-objects-for-uid		\
-        test-ecal-remove-object			\
-        test-ecal-get-object-list		\
-        test-ecal-modify-object			\
-        test-ecal-send-objects			\
-        test-ecal-receive-objects		\
-        test-ecal-get-query			\
-        test-ecal-stress-factory--serial	\
-        test-ecal-stress-factory--fifo		\
-        test-ecal-stress-factory--single-cal	\
-        test-ecal-stress-factory--open-async	\
-        $(NULL)
+	test-ecal-remove			\
+	test-ecal-open				\
+	test-ecal-get-free-busy			\
+	test-ecal-get-timezone			\
+	test-ecal-add-timezone			\
+	test-ecal-set-default-timezone		\
+	test-ecal-get-alarm-email-address	\
+	test-ecal-get-cal-address		\
+	test-ecal-get-ldap-attribute		\
+	test-ecal-get-capabilities		\
+	test-ecal-get-default-object		\
+	test-ecal-set-mode			\
+	test-ecal-create-object			\
+	test-ecal-create-object--2		\
+	test-ecal-get-objects-for-uid		\
+	test-ecal-remove-object			\
+	test-ecal-get-object-list		\
+	test-ecal-modify-object			\
+	test-ecal-send-objects			\
+	test-ecal-receive-objects		\
+	test-ecal-get-query			\
+	test-ecal-stress-factory--serial	\
+	test-ecal-stress-factory--fifo		\
+	test-ecal-stress-factory--single-cal	\
+	test-ecal-stress-factory--open-async	\
+	$(NULL)
 
 # The test program
 noinst_PROGRAMS = $(TESTS) test-ecal test-recur test-search
@@ -124,9 +124,10 @@ test_ecal_CPPFLAGS = $(TEST_ECAL_CPPFLAGS)
 test_ecal_INCLUDES =			\
 	$(INCLUDES)			\
 	-DG_LOG_DOMAIN=\"test-ecal\"
-test_ecal_LDADD =								\
-	$(top_builddir)/calendar/libecal/libecal-1.2.la				\
-	$(LIBICAL_LIBS)								\
+test_ecal_LDADD =							\
+	$(top_builddir)/calendar/libecal/libecal-1.2.la			\
+	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
+	$(LIBICAL_LIBS)							\
 	$(EVOLUTION_CALENDAR_LIBS)
 
 test_recur_SOURCES = test-recur.c
@@ -134,9 +135,10 @@ test_recur_CPPFLAGS = $(TEST_ECAL_CPPFLAGS)
 test_recur_INCLUDES =			\
 	$(INCLUDES)			\
 	-DG_LOG_DOMAIN=\"test-ecal\"
-test_recur_LDADD =								\
-	$(top_builddir)/calendar/libecal/libecal-1.2.la				\
-	$(LIBICAL_LIBS)								\
+test_recur_LDADD =							\
+	$(top_builddir)/calendar/libecal/libecal-1.2.la			\
+	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
+	$(LIBICAL_LIBS)							\
 	$(EVOLUTION_CALENDAR_LIBS)
 
 test_search_SOURCES = test-search.c
@@ -144,9 +146,10 @@ test_search_CPPFLAGS = $(TEST_ECAL_CPPFLAGS)
 test_search_INCLUDES =			\
 	$(INCLUDES)			\
 	-DG_LOG_DOMAIN=\"test-ecal\"
-test_search_LDADD =								\
-	$(top_builddir)/calendar/libecal/libecal-1.2.la				\
-	$(LIBICAL_LIBS)								\
+test_search_LDADD =							\
+	$(top_builddir)/calendar/libecal/libecal-1.2.la			\
+	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
+	$(LIBICAL_LIBS)							\
 	$(EVOLUTION_CALENDAR_LIBS)
 
 -include $(top_srcdir)/git.mk
diff --git a/docs/reference/addressbook/libebook/Makefile.am b/docs/reference/addressbook/libebook/Makefile.am
index 084b167..a6d3bb6 100644
--- a/docs/reference/addressbook/libebook/Makefile.am
+++ b/docs/reference/addressbook/libebook/Makefile.am
@@ -30,6 +30,7 @@ GTKDOC_CFLAGS = \
 
 GTKDOC_LIBS = \
 	$(top_builddir)/addressbook/libebook/libebook-1.2.la	\
+	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
diff --git a/docs/reference/addressbook/libebook/tmpl/e-book-types.sgml b/docs/reference/addressbook/libebook/tmpl/e-book-types.sgml
index d90103c..f4ec9ce 100644
--- a/docs/reference/addressbook/libebook/tmpl/e-book-types.sgml
+++ b/docs/reference/addressbook/libebook/tmpl/e-book-types.sgml
@@ -60,13 +60,14 @@ Evolution:BookListener interface.
 @E_BOOK_ERROR_AUTHENTICATION_FAILED: 
 @E_BOOK_ERROR_AUTHENTICATION_REQUIRED: 
 @E_BOOK_ERROR_TLS_NOT_AVAILABLE: 
- E_BOOK_ERROR_CORBA_EXCEPTION: 
+ E_BOOK_ERROR_DBUS_EXCEPTION: 
 @E_BOOK_ERROR_NO_SUCH_SOURCE: 
 @E_BOOK_ERROR_OFFLINE_UNAVAILABLE: 
 @E_BOOK_ERROR_OTHER_ERROR: 
 @E_BOOK_ERROR_INVALID_SERVER_VERSION: 
 @E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD: 
 @E_BOOK_ERROR_NO_SPACE: 
+ E_BOOK_ERROR_NOT_SUPPORTED: 
 
 <!-- ##### ENUM EBookViewStatus ##### -->
 <para>
diff --git a/docs/reference/addressbook/libebook/tmpl/e-book-view.sgml b/docs/reference/addressbook/libebook/tmpl/e-book-view.sgml
index f294083..04cd5ae 100644
--- a/docs/reference/addressbook/libebook/tmpl/e-book-view.sgml
+++ b/docs/reference/addressbook/libebook/tmpl/e-book-view.sgml
@@ -74,6 +74,15 @@ Fired with a status message reporting the progress of the view.
 @ebookview: the object which received the signal.
 @arg1: a const char* message
 
+<!-- ##### SIGNAL EBookView::view-complete ##### -->
+<para>
+
+</para>
+
+ ebookview: the object which received the signal.
+ arg1: 
+ arg2: 
+
 <!-- ##### FUNCTION e_book_view_start ##### -->
 <para>
 
diff --git a/docs/reference/addressbook/libedata-book/Makefile.am b/docs/reference/addressbook/libedata-book/Makefile.am
index ea5a38c..aa97dfe 100644
--- a/docs/reference/addressbook/libedata-book/Makefile.am
+++ b/docs/reference/addressbook/libedata-book/Makefile.am
@@ -30,6 +30,7 @@ GTKDOC_CFLAGS = \
 
 GTKDOC_LIBS = \
 	$(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la	\
+	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
 	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
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 95bd344..ece2e2a 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
@@ -20,12 +20,6 @@ EBookBackendSync
 <!-- ##### SECTION Image ##### -->
 
 
-<!-- ##### TYPEDEF EBookBackendSyncStatus ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### STRUCT EBookBackendSync ##### -->
 <para>
 
@@ -49,7 +43,7 @@ EBookBackendSync
 @backend: 
 @book: 
 @opid: 
- Returns: 
+ perror: 
 
 
 <!-- ##### FUNCTION e_book_backend_sync_create_contact ##### -->
@@ -62,7 +56,7 @@ EBookBackendSync
 @opid: 
 @vcard: 
 @contact: 
- Returns: 
+ perror: 
 
 
 <!-- ##### FUNCTION e_book_backend_sync_remove_contacts ##### -->
@@ -75,7 +69,7 @@ EBookBackendSync
 @opid: 
 @id_list: 
 @removed_ids: 
- Returns: 
+ perror: 
 
 
 <!-- ##### FUNCTION e_book_backend_sync_modify_contact ##### -->
@@ -88,7 +82,7 @@ EBookBackendSync
 @opid: 
 @vcard: 
 @contact: 
- Returns: 
+ perror: 
 
 
 <!-- ##### FUNCTION e_book_backend_sync_get_contact ##### -->
@@ -101,7 +95,7 @@ EBookBackendSync
 @opid: 
 @id: 
 @vcard: 
- Returns: 
+ perror: 
 
 
 <!-- ##### FUNCTION e_book_backend_sync_get_contact_list ##### -->
@@ -114,7 +108,7 @@ EBookBackendSync
 @opid: 
 @query: 
 @contacts: 
- Returns: 
+ perror: 
 
 
 <!-- ##### FUNCTION e_book_backend_sync_get_changes ##### -->
@@ -127,7 +121,7 @@ EBookBackendSync
 @opid: 
 @change_id: 
 @changes: 
- Returns: 
+ perror: 
 
 
 <!-- ##### FUNCTION e_book_backend_sync_authenticate_user ##### -->
@@ -141,7 +135,7 @@ EBookBackendSync
 @user: 
 @passwd: 
 @auth_method: 
- Returns: 
+ perror: 
 
 
 <!-- ##### FUNCTION e_book_backend_sync_get_required_fields ##### -->
@@ -153,7 +147,7 @@ EBookBackendSync
 @book: 
 @opid: 
 @fields: 
- Returns: 
+ perror: 
 
 
 <!-- ##### FUNCTION e_book_backend_sync_get_supported_fields ##### -->
@@ -165,7 +159,7 @@ EBookBackendSync
 @book: 
 @opid: 
 @fields: 
- Returns: 
+ perror: 
 
 
 <!-- ##### FUNCTION e_book_backend_sync_get_supported_auth_methods ##### -->
@@ -177,6 +171,6 @@ EBookBackendSync
 @book: 
 @opid: 
 @methods: 
- Returns: 
+ perror: 
 
 
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 ee9ca25..11a5620 100644
--- a/docs/reference/addressbook/libedata-book/tmpl/e-book-backend.sgml
+++ b/docs/reference/addressbook/libedata-book/tmpl/e-book-backend.sgml
@@ -50,7 +50,7 @@ EBookBackend
 @backend: 
 @source: 
 @only_if_exists: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_book_backend_get_source ##### -->
@@ -263,7 +263,7 @@ EBookBackend
 
 @backend: 
 @book: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_book_backend_set_mode ##### -->
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 5edb5d5..483aa98 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
@@ -33,6 +33,7 @@ EDataBookView
 
 @edatabookview: the object which received the signal.
 @arg1: 
+ Param3: 
 
 <!-- ##### SIGNAL EDataBookView::contacts-added ##### -->
 <para>
@@ -168,7 +169,7 @@ EDataBookView
 </para>
 
 @book_view: 
- status: 
+ error: 
 
 
 <!-- ##### FUNCTION e_data_book_view_notify_status_message ##### -->
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 542d6a2..6330848 100644
--- a/docs/reference/addressbook/libedata-book/tmpl/e-data-book.sgml
+++ b/docs/reference/addressbook/libedata-book/tmpl/e-data-book.sgml
@@ -91,7 +91,7 @@ EDataBook
 
 @book: 
 @opid: 
- status: 
+ error: 
 
 
 <!-- ##### FUNCTION e_data_book_respond_remove ##### -->
@@ -101,7 +101,7 @@ EDataBook
 
 @book: 
 @opid: 
- status: 
+ error: 
 
 
 <!-- ##### FUNCTION e_data_book_respond_create ##### -->
@@ -111,7 +111,7 @@ EDataBook
 
 @book: 
 @opid: 
- status: 
+ error: 
 @contact: 
 
 
@@ -122,7 +122,7 @@ EDataBook
 
 @book: 
 @opid: 
- status: 
+ error: 
 @ids: 
 
 
@@ -133,7 +133,7 @@ EDataBook
 
 @book: 
 @opid: 
- status: 
+ error: 
 @contact: 
 
 
@@ -144,7 +144,7 @@ EDataBook
 
 @book: 
 @opid: 
- status: 
+ error: 
 
 
 <!-- ##### FUNCTION e_data_book_respond_get_supported_fields ##### -->
@@ -154,7 +154,7 @@ EDataBook
 
 @book: 
 @opid: 
- status: 
+ error: 
 @fields: 
 
 
@@ -165,7 +165,7 @@ EDataBook
 
 @book: 
 @opid: 
- status: 
+ error: 
 @fields: 
 
 
@@ -176,7 +176,7 @@ EDataBook
 
 @book: 
 @opid: 
- status: 
+ error: 
 @fields: 
 
 
@@ -187,7 +187,7 @@ EDataBook
 
 @book: 
 @opid: 
- status: 
+ error: 
 @vcard: 
 
 
@@ -198,7 +198,7 @@ EDataBook
 
 @book: 
 @opid: 
- status: 
+ error: 
 @cards: 
 
 
@@ -209,7 +209,7 @@ EDataBook
 
 @book: 
 @opid: 
- status: 
+ error: 
 @changes: 
 
 
diff --git a/docs/reference/addressbook/libedata-book/tmpl/libedata-book-unused.sgml b/docs/reference/addressbook/libedata-book/tmpl/libedata-book-unused.sgml
index 38a8607..0481b2b 100644
--- a/docs/reference/addressbook/libedata-book/tmpl/libedata-book-unused.sgml
+++ b/docs/reference/addressbook/libedata-book/tmpl/libedata-book-unused.sgml
@@ -119,6 +119,12 @@ e-data-book-types
 </para>
 
 
+<!-- ##### TYPEDEF EBookBackendSyncStatus ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### STRUCT EDataBookClass ##### -->
 <para>
 
diff --git a/docs/reference/calendar/libecal/Makefile.am b/docs/reference/calendar/libecal/Makefile.am
index d988f39..72492be 100644
--- a/docs/reference/calendar/libecal/Makefile.am
+++ b/docs/reference/calendar/libecal/Makefile.am
@@ -31,6 +31,7 @@ GTKDOC_CFLAGS = \
 
 GTKDOC_LIBS = \
 	$(top_builddir)/calendar/libecal/libecal-1.2.la		\
+	$(top_builddir)/libedataserver/libedataserver-1.2.la	\
 	$(EVOLUTION_CALENDAR_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
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 9819733..7f919b9 100644
--- a/docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml
+++ b/docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml
@@ -50,6 +50,7 @@ e-cal-check-timezones
 @const gchar *tzid, gconstpointer custom, GError **error:
 @const gchar *tzid, gconstpointer custom, GError **error:
 @const gchar *tzid, gconstpointer custom, GError **error:
+ const gchar *tzid, gconstpointer custom, GError **error:
 @const gchar *tzid, gconstpointer custom, GError **error: 
 @custom: 
 @error: 
diff --git a/docs/reference/calendar/libecal/tmpl/e-cal-types.sgml b/docs/reference/calendar/libecal/tmpl/e-cal-types.sgml
index 8718322..1dd8fae 100644
--- a/docs/reference/calendar/libecal/tmpl/e-cal-types.sgml
+++ b/docs/reference/calendar/libecal/tmpl/e-cal-types.sgml
@@ -67,7 +67,8 @@ e-cal-types
 @E_CALENDAR_STATUS_COULD_NOT_CANCEL: 
 @E_CALENDAR_STATUS_AUTHENTICATION_FAILED: 
 @E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED: 
- E_CALENDAR_STATUS_CORBA_EXCEPTION: 
+ E_CALENDAR_STATUS_DBUS_EXCEPTION: 
 @E_CALENDAR_STATUS_OTHER_ERROR: 
 @E_CALENDAR_STATUS_INVALID_SERVER_VERSION: 
+ E_CALENDAR_STATUS_NOT_SUPPORTED: 
 
diff --git a/docs/reference/calendar/libecal/tmpl/e-cal-view.sgml b/docs/reference/calendar/libecal/tmpl/e-cal-view.sgml
index ff528fa..6ad6ea9 100644
--- a/docs/reference/calendar/libecal/tmpl/e-cal-view.sgml
+++ b/docs/reference/calendar/libecal/tmpl/e-cal-view.sgml
@@ -51,6 +51,15 @@ ECalView is a view of the ECal.
 @ecalview: the object which received the signal.
 @arg1: 
 
+<!-- ##### SIGNAL ECalView::view-complete ##### -->
+<para>
+
+</para>
+
+ ecalview: the object which received the signal.
+ arg1: 
+ arg2: 
+
 <!-- ##### SIGNAL ECalView::view-done ##### -->
 <para>
 
diff --git a/docs/reference/calendar/libecal/tmpl/e-cal.sgml b/docs/reference/calendar/libecal/tmpl/e-cal.sgml
index 63d0b37..ad03e86 100644
--- a/docs/reference/calendar/libecal/tmpl/e-cal.sgml
+++ b/docs/reference/calendar/libecal/tmpl/e-cal.sgml
@@ -49,6 +49,14 @@ Represents an entire calendar or task list, not individual items within them.2
 @ecal: the object which received the signal.
 @arg1: 
 
+<!-- ##### SIGNAL ECal::cal-opened-ex ##### -->
+<para>
+
+</para>
+
+ ecal: the object which received the signal.
+ arg1: 
+
 <!-- ##### SIGNAL ECal::cal-set-mode ##### -->
 <para>
 
diff --git a/docs/reference/calendar/libedata-cal/Makefile.am b/docs/reference/calendar/libedata-cal/Makefile.am
index 10ed038..3ad947a 100644
--- a/docs/reference/calendar/libedata-cal/Makefile.am
+++ b/docs/reference/calendar/libedata-cal/Makefile.am
@@ -35,6 +35,7 @@ GTKDOC_CFLAGS = \
 
 GTKDOC_LIBS = \
 	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la	\
+	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
 	$(top_builddir)/libebackend/libebackend-1.2.la			\
 	$(EVOLUTION_CALENDAR_LIBS)					\
 	$(DB_LIBS)
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 54fec7f..d5c44ad 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
@@ -26,12 +26,6 @@ Base class for synchronous backends.
 </para>
 
 
-<!-- ##### TYPEDEF ECalBackendSyncStatus ##### -->
-<para>
-
-</para>
-
-
 <!-- ##### USER_FUNCTION ECalBackendSyncFactoryFn ##### -->
 <para>
 
@@ -58,7 +52,7 @@ Base class for synchronous backends.
 @backend: 
 @cal: 
 @read_only: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_get_cal_address ##### -->
@@ -69,7 +63,7 @@ Base class for synchronous backends.
 @backend: 
 @cal: 
 @address: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_get_alarm_email_address ##### -->
@@ -80,7 +74,7 @@ Base class for synchronous backends.
 @backend: 
 @cal: 
 @address: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_get_ldap_attribute ##### -->
@@ -91,7 +85,7 @@ Base class for synchronous backends.
 @backend: 
 @cal: 
 @attribute: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_get_static_capabilities ##### -->
@@ -102,7 +96,7 @@ Base class for synchronous backends.
 @backend: 
 @cal: 
 @capabiliites: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_open ##### -->
@@ -115,7 +109,7 @@ Base class for synchronous backends.
 @only_if_exists: 
 @username: 
 @password: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_refresh ##### -->
@@ -125,7 +119,7 @@ Base class for synchronous backends.
 
 @backend: 
 @cal: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_remove ##### -->
@@ -135,7 +129,7 @@ Base class for synchronous backends.
 
 @backend: 
 @cal: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_create_object ##### -->
@@ -147,7 +141,7 @@ Base class for synchronous backends.
 @cal: 
 @calobj: 
 @uid: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_modify_object ##### -->
@@ -161,7 +155,7 @@ Base class for synchronous backends.
 @mod: 
 @old_object: 
 @new_object: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_remove_object ##### -->
@@ -176,7 +170,7 @@ Base class for synchronous backends.
 @mod: 
 @old_object: 
 @object: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_get_attachment_list ##### -->
@@ -189,7 +183,7 @@ Base class for synchronous backends.
 @uid: 
 @rid: 
 @attachments: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_discard_alarm ##### -->
@@ -201,7 +195,7 @@ Base class for synchronous backends.
 @cal: 
 @uid: 
 @auid: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_receive_objects ##### -->
@@ -212,7 +206,7 @@ Base class for synchronous backends.
 @backend: 
 @cal: 
 @calobj: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_send_objects ##### -->
@@ -225,7 +219,7 @@ Base class for synchronous backends.
 @calobj: 
 @users: 
 @modified_calobj: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_get_default_object ##### -->
@@ -236,7 +230,7 @@ Base class for synchronous backends.
 @backend: 
 @cal: 
 @object: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_get_object ##### -->
@@ -249,7 +243,7 @@ Base class for synchronous backends.
 @uid: 
 @rid: 
 @object: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_get_object_list ##### -->
@@ -261,7 +255,7 @@ Base class for synchronous backends.
 @cal: 
 @sexp: 
 @objects: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_get_timezone ##### -->
@@ -273,7 +267,7 @@ Base class for synchronous backends.
 @cal: 
 @tzid: 
 @object: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_add_timezone ##### -->
@@ -284,7 +278,7 @@ Base class for synchronous backends.
 @backend: 
 @cal: 
 @tzobj: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_set_default_timezone ##### -->
@@ -295,7 +289,7 @@ Base class for synchronous backends.
 @backend: 
 @cal: 
 @tzid: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_set_default_zone ##### -->
@@ -306,7 +300,7 @@ Base class for synchronous backends.
 @backend: 
 @cal: 
 @tzobj: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_get_changes ##### -->
@@ -320,7 +314,7 @@ Base class for synchronous backends.
 @adds: 
 @modifies: 
 @deletes: 
- Returns: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_sync_get_free_busy ##### -->
@@ -334,6 +328,6 @@ Base class for synchronous backends.
 @start: 
 @end: 
 @freebusy: 
- Returns: 
+ error: 
 
 
diff --git a/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend-util.sgml b/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend-util.sgml
index dd5953f..11112e9 100644
--- a/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend-util.sgml
+++ b/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend-util.sgml
@@ -40,15 +40,6 @@ Utility functions for backends.
 @Returns: 
 
 
-<!-- ##### FUNCTION e_cal_backend_status_to_string ##### -->
-<para>
-
-</para>
-
- status: 
- Returns: 
-
-
 <!-- ##### FUNCTION e_cal_backend_user_declined ##### -->
 <para>
 
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 8241e19..95a9f31 100644
--- a/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend.sgml
+++ b/docs/reference/calendar/libedata-cal/tmpl/e-cal-backend.sgml
@@ -33,22 +33,6 @@ Base class for calendar/tasks backend implementations.
 
 @ecalbackend: the object which received the signal.
 
-<!-- ##### SIGNAL ECalBackend::opened ##### -->
-<para>
-
-</para>
-
- ecalbackend: the object which received the signal.
- arg1: 
-
-<!-- ##### SIGNAL ECalBackend::removed ##### -->
-<para>
-
-</para>
-
- ecalbackend: the object which received the signal.
- arg1: 
-
 <!-- ##### ARG ECalBackend:kind ##### -->
 <para>
 
@@ -528,7 +512,7 @@ Base class for calendar/tasks backend implementations.
 </para>
 
 @backend: 
- status: 
+ error: 
 
 
 <!-- ##### FUNCTION e_cal_backend_notify_view_progress_start ##### -->
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 dfb3363..fed909e 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
@@ -111,15 +111,6 @@ Implementation of the calendar CORBA search interface.
 @Returns: 
 
 
-<!-- ##### FUNCTION e_data_cal_view_get_done_status ##### -->
-<para>
-
-</para>
-
- query: 
- Returns: 
-
-
 <!-- ##### FUNCTION e_data_cal_view_notify_objects_added ##### -->
 <para>
 
@@ -190,6 +181,6 @@ Implementation of the calendar CORBA search interface.
 </para>
 
 @query: 
- status: 
+ 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 aeea7d4..b07eb5f 100644
--- a/docs/reference/calendar/libedata-cal/tmpl/e-data-cal.sgml
+++ b/docs/reference/calendar/libedata-cal/tmpl/e-data-cal.sgml
@@ -98,7 +98,7 @@ Implementation of the calendar CORBA client interface.
 </para>
 
 @cal: 
- status: 
+ error: 
 @read_only: 
 
 
@@ -109,7 +109,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 @address: 
 
 
@@ -120,7 +120,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 @address: 
 
 
@@ -131,7 +131,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 @attribute: 
 
 
@@ -142,7 +142,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 @capabilities: 
 
 
@@ -153,7 +153,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 
 
 <!-- ##### FUNCTION e_data_cal_notify_refresh ##### -->
@@ -163,7 +163,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 
 
 <!-- ##### FUNCTION e_data_cal_notify_remove ##### -->
@@ -173,7 +173,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 
 
 <!-- ##### FUNCTION e_data_cal_notify_object_created ##### -->
@@ -183,7 +183,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 @uid: 
 @object: 
 
@@ -195,7 +195,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 @old_object: 
 @object: 
 
@@ -207,7 +207,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 @id: 
 @old_object: 
 @object: 
@@ -220,7 +220,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 
 
 <!-- ##### FUNCTION e_data_cal_notify_objects_received ##### -->
@@ -230,7 +230,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 
 
 <!-- ##### FUNCTION e_data_cal_notify_objects_sent ##### -->
@@ -240,7 +240,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 @users: 
 @calobj: 
 
@@ -252,7 +252,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 @object: 
 
 
@@ -263,7 +263,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 @object: 
 
 
@@ -274,7 +274,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 @objects: 
 
 
@@ -285,7 +285,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 @query_path: 
 
 
@@ -296,7 +296,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 @object: 
 
 
@@ -307,7 +307,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 @tzid: 
 
 
@@ -318,7 +318,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 
 
 <!-- ##### FUNCTION e_data_cal_notify_changes ##### -->
@@ -328,7 +328,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 @adds: 
 @modifies: 
 @deletes: 
@@ -341,7 +341,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 @freebusy: 
 
 
@@ -379,7 +379,7 @@ Implementation of the calendar CORBA client interface.
 
 @cal: 
 @context: 
- status: 
+ error: 
 @objects: 
 
 
diff --git a/docs/reference/camel/tmpl/camel-cipher-context.sgml b/docs/reference/camel/tmpl/camel-cipher-context.sgml
index b2f7687..2cdfa69 100644
--- a/docs/reference/camel/tmpl/camel-cipher-context.sgml
+++ b/docs/reference/camel/tmpl/camel-cipher-context.sgml
@@ -450,6 +450,8 @@ CamelCipherContext
 @gpointer cert_data: 
 @gpointer cert_data:
 @gpointer cert_data: 
+ gpointer cert_data:
+ gpointer cert_data: 
 @gpointer cert_data: 
 
 
diff --git a/docs/reference/libedataserverui/Makefile.am b/docs/reference/libedataserverui/Makefile.am
index daa4df5..3b00b91 100644
--- a/docs/reference/libedataserverui/Makefile.am
+++ b/docs/reference/libedataserverui/Makefile.am
@@ -29,10 +29,12 @@ GTKDOC_CFLAGS  =					\
 if ENABLE_GTK3
 GTKDOC_LIBS = 								\
 	$(top_builddir)/libedataserverui/libedataserverui-3.0.la	\
+	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
 	$(E_DATA_SERVER_UI_LIBS)
 else
 GTKDOC_LIBS = 								\
 	$(top_builddir)/libedataserverui/libedataserverui-1.2.la	\
+	$(top_builddir)/libedataserver/libedataserver-1.2.la		\
 	$(E_DATA_SERVER_UI_LIBS)
 endif
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]