[evolution-kolab/gnome-3-4] CamelIMAPXExtdServer: updated for upstream fixes

[Christian Hilberg <chilberg src gnome org>]

commit 1a3ebba9e9cf34fe93c69f590c75202ca8e7ca49
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Mon Jun 18 14:23:21 2012 +0200

    CamelIMAPXExtdServer: updated for upstream fixes
    
    * updated for upstream CamelIMAPXServer fixes
      (#677841, #664639 from upstream master)

 .../providers/imapx/camel-imapx-extd-server.c      |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/src/camel/providers/imapx/camel-imapx-extd-server.c b/src/camel/providers/imapx/camel-imapx-extd-server.c
index f71ddfb..3b98997 100644
--- a/src/camel/providers/imapx/camel-imapx-extd-server.c
+++ b/src/camel/providers/imapx/camel-imapx-extd-server.c
@@ -1237,8 +1237,7 @@ extd_server_parser_thread (gpointer d)
 
 		if (is->parser_quit)
 			g_cancellable_cancel (cancellable);
-
-		if (g_cancellable_is_cancelled (cancellable)) {
+		else if (g_cancellable_is_cancelled (cancellable)) {
 			gint is_empty;
 
 			QUEUE_LOCK (is);
@@ -1276,7 +1275,6 @@ extd_server_parser_thread (gpointer d)
 	QUEUE_UNLOCK (is);
 
 	is->parser_quit = FALSE;
-
 	g_signal_emit (is, signals[SHUTDOWN], 0);
 
 	return NULL;