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

[David Woodhouse <dwmw2 src gnome org>]

commit 237352d97330812bbbb0f061c3a01e35374da19c
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 |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/camel/providers/imapx/camel-imapx-folder.c b/camel/providers/imapx/camel-imapx-folder.c
index 44f8410..87b49d0 100644
--- a/camel/providers/imapx/camel-imapx-folder.c
+++ b/camel/providers/imapx/camel-imapx-folder.c
@@ -172,19 +172,20 @@ imapx_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
 		ex = &eex;
 
 	server = camel_imapx_store_get_server(is, ex);
-	if (server)
-		camel_imapx_server_sync_changes (server, folder, ex);
+	if (!server)
+		return;
+
+	camel_imapx_server_sync_changes (server, folder, ex);
 
 	/* Sync twice - make sure deleted flags are written out,
 	   then sync again incase expunge changed anything */
 	camel_exception_clear(ex);
 
-	if (server && expunge) {
+	if (expunge) {
 		camel_imapx_server_expunge(server, folder, ex);
 		camel_exception_clear(ex);
 	}
-	if (server)
-		camel_object_unref(server);
+	camel_object_unref(server);
 }
 
 static CamelMimeMessage *