[evolution-kolab/ek-wip-porting: 22/22] CamelKolabSession: propagate GError in authenticate()

[Christian Hilberg <chilberg src gnome org>]

commit ed29648ded48f3fca3ebe9a491642c63838f6e1b
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Tue Sep 4 19:41:18 2012 +0200

    CamelKolabSession: propagate GError in authenticate()
    
    * if we got cancelled, we need to propagate that
      error in addition to returning FALSE

 src/libekolab/camel-kolab-session.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/src/libekolab/camel-kolab-session.c b/src/libekolab/camel-kolab-session.c
index 9c6957e..ac3b14e 100644
--- a/src/libekolab/camel-kolab-session.c
+++ b/src/libekolab/camel-kolab-session.c
@@ -259,8 +259,10 @@ kolab_session_authenticate_sync (CamelSession *session,
 
 	/* Abort authentication if we got cancelled.
 	 * Otherwise clear any errors and press on. */
-	if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+	if (g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
+		g_propagate_error (error, local_error);
 		return FALSE;
+	}
 
 	g_clear_error (&local_error);