[evolution-data-server] g_cancellable_reset() doesn't like NULL cancellable

[Milan Crha <mcrha src gnome org>]

commit 32cfafe2168b79f590b70048deeef41da431993e
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jun 13 10:51:44 2012 +0200

    g_cancellable_reset() doesn't like NULL cancellable

 camel/providers/imap/camel-imap-store.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index c2a4c23..fba76e7 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -842,7 +842,8 @@ imap_store_connect_sync (CamelService *service,
 	    !imap_auth_loop (service, cancellable, error)) {
 		/* reset cancellable, in case it is cancelled,
 		   thus the disconnect is run */
-		g_cancellable_reset (cancellable);
+		if (cancellable)
+			g_cancellable_reset (cancellable);
 		camel_service_disconnect_sync (
 			service, TRUE, cancellable, NULL);
 		return FALSE;
@@ -1019,7 +1020,8 @@ done:
 	if (local_error != NULL) {
 		/* reset cancellable, in case it is cancelled,
 		   thus the disconnect is run */
-		g_cancellable_reset (cancellable);
+		if (cancellable)
+			g_cancellable_reset (cancellable);
 		camel_service_disconnect_sync (
 			service, TRUE, cancellable, NULL);
 		g_propagate_error (error, local_error);