[evolution-kolab/ek-wip-porting] CamelKolabIMAPXServer: allow NULL function params for GCancellable*

[Christian Hilberg <chilberg src gnome org>]

commit b7ecd5a6fdc285630ebb409c923c016391b3a6dc
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Mon Jan 23 22:31:33 2012 +0100

    CamelKolabIMAPXServer: allow NULL function params for GCancellable*

 src/camel/camel-kolab-imapx-server.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/camel/camel-kolab-imapx-server.c b/src/camel/camel-kolab-imapx-server.c
index 1c6698e..588fdb8 100644
--- a/src/camel/camel-kolab-imapx-server.c
+++ b/src/camel/camel-kolab-imapx-server.c
@@ -145,7 +145,7 @@ kolab_imapx_server_get_foldertype (CamelKolabIMAPXServer *self,
 
 	g_assert (CAMEL_IS_KOLAB_IMAPX_SERVER (self));
 	g_assert (foldername != NULL);
-	g_assert (G_IS_CANCELLABLE (cancellable));
+	/* cancellable may be NULL */
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
 	priv = CAMEL_KOLAB_IMAPX_SERVER_PRIVATE (self);
@@ -260,7 +260,7 @@ kolab_imapx_server_set_foldertype (CamelKolabIMAPXServer *self,
 
 	g_assert (CAMEL_IS_KOLAB_IMAPX_SERVER (self));
 	g_assert (foldername != NULL);
-	g_assert (G_IS_CANCELLABLE (cancellable));
+	/* cancellable may be NULL */
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
 	priv = CAMEL_KOLAB_IMAPX_SERVER_PRIVATE (self);
@@ -442,7 +442,7 @@ camel_kolab_imapx_server_retrieve_all_folder_types (CamelKolabIMAPXServer *self,
 	GError *tmp_err = NULL;
 
 	g_assert (CAMEL_IS_KOLAB_IMAPX_SERVER (self));
-	g_assert (G_IS_CANCELLABLE (cancellable));
+	/* cancellable may be NULL */
 	g_return_val_if_fail (err == NULL || *err == NULL, FALSE);
 
 	priv = CAMEL_KOLAB_IMAPX_SERVER_PRIVATE (self);