[evolution-data-server] Workaround compiler warnings

[Milan Crha <mcrha src gnome org>]

commit 9a3a2402f3d4eb65f043c7608ee2397711c67a17
Author: Milan Crha <mcrha redhat com>
Date:   Fri Jun 3 16:21:49 2011 +0200

    Workaround compiler warnings

 camel/camel-db.c    |    4 ++--
 camel/camel-store.c |    6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/camel/camel-db.c b/camel/camel-db.c
index 968cc27..0486efe 100644
--- a/camel/camel-db.c
+++ b/camel/camel-db.c
@@ -1552,11 +1552,11 @@ camel_db_get_folder_version (CamelDB *cdb,
                              const gchar *folder_name,
                              GError **error)
 {
-	gint version = -1, ret;
+	gint version = -1;
 	gchar *query;
 
 	query = sqlite3_mprintf ("SELECT version FROM '%q_version'", folder_name);
-	ret = camel_db_select (cdb, query, read_version_callback, &version, error);
+	camel_db_select (cdb, query, read_version_callback, &version, error);
 	sqlite3_free (query);
 
 	return version;
diff --git a/camel/camel-store.c b/camel/camel-store.c
index bcebd68..d9faa27 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -2912,7 +2912,7 @@ camel_store_delete_folder_sync (CamelStore *store,
 {
 	CamelStoreClass *class;
 	gboolean success;
-	GError *local_error = NULL;
+	GError *local_error = NULL, **check_error = NULL;
 
 	g_return_val_if_fail (CAMEL_IS_STORE (store), FALSE);
 	g_return_val_if_fail (folder_name != NULL, FALSE);
@@ -2941,7 +2941,9 @@ camel_store_delete_folder_sync (CamelStore *store,
 
 	success = class->delete_folder_sync (
 		store, folder_name, cancellable, &local_error);
-	CAMEL_CHECK_GERROR (store, delete_folder_sync, success, &local_error);
+	if (local_error)
+		check_error = &local_error;
+	CAMEL_CHECK_GERROR (store, delete_folder_sync, success, check_error);
 
 	/* ignore 'no such table' errors */
 	if (local_error != NULL &&