[evolution-data-server] Fix distcheck errors.

[Matthew Barnes <mbarnes src gnome org>]

commit 3e9a2e27b227d48431ae48d11192cc35bc336dcb
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat May 1 17:25:06 2010 -0400

    Fix distcheck errors.

 camel/tests/folder/test9.c                         |    2 +-
 camel/tests/lib/camel-test.c                       |    2 -
 camel/tests/lib/folders.c                          |    9 +---
 camel/tests/smime/pgp.c                            |   41 +++++++-------------
 .../libecal/tmpl/e-cal-check-timezones.sgml        |    1 +
 .../reference/camel/tmpl/camel-cipher-context.sgml |    2 +
 6 files changed, 20 insertions(+), 37 deletions(-)
---
diff --git a/camel/tests/folder/test9.c b/camel/tests/folder/test9.c
index 2ee34ff..b274482 100644
--- a/camel/tests/folder/test9.c
+++ b/camel/tests/folder/test9.c
@@ -69,7 +69,7 @@ static CamelFolder *
 get_folder (CamelFilterDriver *d,
             const gchar *uri,
             gpointer data,
-            CamelException *ex);
+            CamelException *ex)
 {
 	gint i;
 
diff --git a/camel/tests/lib/camel-test.c b/camel/tests/lib/camel-test.c
index e289bf4..9a23140 100644
--- a/camel/tests/lib/camel-test.c
+++ b/camel/tests/lib/camel-test.c
@@ -113,8 +113,6 @@ void camel_test_init(gint argc, gchar **argv)
 	camel_init (path, FALSE);
 	g_free (path);
 
-	camel_type_init ();
-
 	info_table = g_hash_table_new(0, 0);
 
 	signal(SIGSEGV, die);
diff --git a/camel/tests/lib/folders.c b/camel/tests/lib/folders.c
index c7059f5..1fc15e7 100644
--- a/camel/tests/lib/folders.c
+++ b/camel/tests/lib/folders.c
@@ -15,12 +15,7 @@ test_folder_counts(CamelFolder *folder, gint total, gint unread)
 
 	push("test folder counts %d total %d unread", total, unread);
 
-	/* first, use the standard functions */
-	camel_object_get(folder, NULL, CAMEL_FOLDER_TOTAL, &gettotal, CAMEL_FOLDER_UNREAD, &getunread, 0);
-	check(gettotal == total);
-	check(getunread == unread);
-
-	/* next, use the summary */
+	/* use the summary */
 	s = camel_folder_get_summary(folder);
 	check(s != NULL);
 	check(s->len == total);
@@ -33,7 +28,7 @@ test_folder_counts(CamelFolder *folder, gint total, gint unread)
 	check(unread == myunread);
 	camel_folder_free_summary(folder, s);
 
-	/* last, use the uid list */
+	/* use the uid list */
 	s = camel_folder_get_uids(folder);
 	check(s != NULL);
 	check(s->len == total);
diff --git a/camel/tests/smime/pgp.c b/camel/tests/smime/pgp.c
index 483767e..280fceb 100644
--- a/camel/tests/smime/pgp.c
+++ b/camel/tests/smime/pgp.c
@@ -47,47 +47,34 @@ typedef struct _CamelPgpSessionClass {
 
 } CamelPgpSessionClass;
 
-static gchar *get_password (CamelSession *session, const gchar *prompt,
-			   guint32 flags,
-			   CamelService *service, const gchar *item,
-			   CamelException *ex);
+GType camel_pgp_session_get_type (void);
 
 G_DEFINE_TYPE (CamelPgpSession, camel_pgp_session, camel_test_session_get_type ())
 
+static gchar *
+pgp_session_get_password (CamelSession *session,
+                          CamelService *service,
+                          const gchar *domain,
+                          const gchar *prompt,
+                          const gchar *item,
+                          guint32 flags,
+                          CamelException *ex)
+{
+	return g_strdup ("no.secret");
+}
+
 static void
 camel_pgp_session_class_init (CamelPgpSessionClass *class)
 {
 	CamelSessionClass *session_class;
 
 	session_class = CAMEL_SESSION_CLASS (class);
-	camel_session_class->get_password = get_password;
+	session_class->get_password = pgp_session_get_password;
 }
 
 static void
 camel_pgp_session_init (CamelPgpSession *session)
 {
-	static CamelType type = CAMEL_INVALID_TYPE;
-
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register (
-			camel_test_session_get_type (),
-			"CamelPgpSession",
-			sizeof (CamelPgpSession),
-			sizeof (CamelPgpSessionClass),
-			(CamelObjectClassInitFunc) class_init,
-			NULL,
-			(CamelObjectInitFunc) init,
-			NULL);
-	}
-
-	return type;
-}
-
-static gchar *
-get_password (CamelSession *session, const gchar *prompt, guint32 flags,
-	      CamelService *service, const gchar *item, CamelException *ex)
-{
-	return g_strdup ("no.secret");
 }
 
 static CamelSession *
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 75aaabf..555438d 100644
--- a/docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml
+++ b/docs/reference/calendar/libecal/tmpl/e-cal-check-timezones.sgml
@@ -28,6 +28,7 @@ e-cal-check-timezones
 @comp: 
 @comps: 
 @const gchar *tzid, gconstpointer custom, GError **error:
+ const gchar *tzid, gconstpointer custom, GError **error:
 @const gchar *tzid, gconstpointer custom, GError **error: 
 @custom: 
 @error: 
diff --git a/docs/reference/camel/tmpl/camel-cipher-context.sgml b/docs/reference/camel/tmpl/camel-cipher-context.sgml
index 62a59a0..30bfa70 100644
--- a/docs/reference/camel/tmpl/camel-cipher-context.sgml
+++ b/docs/reference/camel/tmpl/camel-cipher-context.sgml
@@ -349,6 +349,8 @@ CamelCipherContext
 @gpointer cert_data: 
 @gpointer cert_data:
 @gpointer cert_data: 
+ gpointer cert_data:
+ gpointer cert_data: 
 @gpointer cert_data: