[evolution-data-server/gnome-2-30] Fix build issues.

[Matthew Barnes <mbarnes src gnome org>]

commit a476843b084bc2299af15ffbf83c42660545cb70
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri May 21 20:19:30 2010 -0400

    Fix build issues.

 camel/camel-block-file.h      |   10 ++++++++++
 camel/camel-partition-table.c |    8 ++++----
 camel/camel-partition-table.h |   10 ++++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)
---
diff --git a/camel/camel-block-file.h b/camel/camel-block-file.h
index 1bf1e5b..af5b402 100644
--- a/camel/camel-block-file.h
+++ b/camel/camel-block-file.h
@@ -27,6 +27,16 @@
 #include <stdio.h>
 #include <sys/types.h>
 
+#define CAMEL_TYPE_BLOCK_FILE \
+	(camel_block_file_get_type ())
+#define CAMEL_IS_BLOCK_FILE(obj) \
+	(CAMEL_CHECK_TYPE ((obj), CAMEL_TYPE_BLOCK_FILE))
+
+#define CAMEL_TYPE_KEY_FILE \
+	(camel_key_file_get_type ())
+#define CAMEL_IS_KEY_FILE(obj) \
+	(CAMEL_CHECK_TYPE ((obj), CAMEL_TYPE_KEY_FILE))
+
 G_BEGIN_DECLS
 
 typedef guint32 camel_block_t;	/* block offset, absolute, bottom BLOCK_SIZE_BITS always 0 */
diff --git a/camel/camel-partition-table.c b/camel/camel-partition-table.c
index ec72430..67abbb7 100644
--- a/camel/camel-partition-table.c
+++ b/camel/camel-partition-table.c
@@ -327,8 +327,8 @@ void camel_partition_table_remove(CamelPartitionTable *cpi, const gchar *key)
 	camel_hash_t hashid;
 	gint index, i;
 
-	g_return_val_if_fail (CAMEL_IS_PARTITION_TABLE (cpi), FALSE);
-	g_return_val_if_fail (key != NULL, FALSE);
+	g_return_if_fail (CAMEL_IS_PARTITION_TABLE (cpi));
+	g_return_if_fail (key != NULL);
 
 	hashid = hash_key (key);
 
@@ -803,7 +803,7 @@ camel_key_table_set_data(CamelKeyTable *ki, camel_key_t keyid, camel_block_t dat
 	gint index;
 	CamelKeyBlock *kb;
 
-	g_return_val_if_fail (CAMEL_IS_KEY_TABLE (ki), FALSE);
+	g_return_if_fail (CAMEL_IS_KEY_TABLE (ki));
 
 	if (keyid == 0)
 		return;
@@ -837,7 +837,7 @@ camel_key_table_set_flags(CamelKeyTable *ki, camel_key_t keyid, guint flags, gui
 	CamelKeyBlock *kb;
 	guint old;
 
-	g_return_val_if_fail (CAMEL_IS_KEY_TABLE (ki), FALSE);
+	g_return_if_fail (CAMEL_IS_KEY_TABLE (ki));
 
 	if (keyid == 0)
 		return;
diff --git a/camel/camel-partition-table.h b/camel/camel-partition-table.h
index 4bfcd98..b0f57e7 100644
--- a/camel/camel-partition-table.h
+++ b/camel/camel-partition-table.h
@@ -27,6 +27,16 @@
 #include "camel-block-file.h"
 #include "camel-list-utils.h"
 
+#define CAMEL_TYPE_PARTITION_TABLE \
+	(camel_partition_table_get_type ())
+#define CAMEL_IS_PARTITION_TABLE(obj) \
+	(CAMEL_CHECK_TYPE ((obj), CAMEL_TYPE_PARTITION_TABLE))
+
+#define CAMEL_TYPE_KEY_TABLE \
+	(camel_key_table_get_type ())
+#define CAMEL_IS_KEY_TABLE(obj) \
+	(CAMEL_CHECK_TYPE ((obj), CAMEL_TYPE_KEY_TABLE))
+
 G_BEGIN_DECLS
 
 /* ********************************************************************** */