[evolution-data-server/gnome-2-32] Bug 630149 - imapx_sync() never returns error

[David Woodhouse <dwmw2 src gnome org>]

commit a7f14ade704211d3b263ab26f6755ca06602d68e
Author: David Woodhouse <David Woodhouse intel com>
Date:   Mon Sep 20 13:29:20 2010 +0100

    Bug 630149 - imapx_sync() never returns error

 camel/providers/imapx/camel-imapx-folder.c |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/camel/providers/imapx/camel-imapx-folder.c b/camel/providers/imapx/camel-imapx-folder.c
index 0de31d0..e4c8e68 100644
--- a/camel/providers/imapx/camel-imapx-folder.c
+++ b/camel/providers/imapx/camel-imapx-folder.c
@@ -225,19 +225,20 @@ imapx_sync (CamelFolder *folder, gboolean expunge, GError **error)
 		return FALSE;
 	}
 
-	server = camel_imapx_store_get_server(istore, camel_folder_get_full_name (folder), NULL);
-	if (server)
-		camel_imapx_server_sync_changes (server, folder, NULL);
+	server = camel_imapx_store_get_server (istore, camel_folder_get_full_name (folder), error);
+	if (!server)
+		return FALSE;
+
+	camel_imapx_server_sync_changes (server, folder, NULL);
 
 	/* Sync twice - make sure deleted flags are written out,
 	   then sync again incase expunge changed anything */
 
-	if (server && expunge)
-		camel_imapx_server_expunge(server, folder, NULL);
-	if (server) {
-		camel_imapx_store_op_done (istore, server, camel_folder_get_full_name (folder));
-		g_object_unref(server);
-	}
+	if (expunge)
+		camel_imapx_server_expunge (server, folder, NULL);
+
+	camel_imapx_store_op_done (istore, server, camel_folder_get_full_name (folder));
+	g_object_unref (server);
 
 	return TRUE;
 }