[evolution/gnome-2-28] Bug #557613 - evolution crashed with SIGSEGV in try_open_e_book_cb()

[Chenthill Palanisamy <pchen src gnome org>]

commit 2e374c1dd51272e9eeeb4b233f777f60540968dd
Author: Chenthill Palanisamy <pchenthill novell com>
Date:   Mon Nov 9 12:40:34 2009 +0530

    Bug #557613 -  evolution crashed with SIGSEGV in try_open_e_book_cb()

 mail/em-utils.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 95cef75..4bb6ef4 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -2076,9 +2076,10 @@ try_open_e_book (EBook *book, gboolean only_if_exists, GError **error)
 	if (canceled) {
 		g_clear_error (error);
 		g_set_error (error, E_BOOK_ERROR, E_BOOK_ERROR_CANCELLED, "Operation has been canceled.");
-		e_book_cancel_async_op (book, NULL);
-		/* it had been canceled, the above callback may not be called, thus setting flag here */
-		e_flag_set (flag);
+		/* if the operation is cancelled sucessfully set the flag else wait. file, groupwise,.. backend's operations
+		   are not cancellable */
+		if (e_book_cancel_async_op (book, NULL))
+			e_flag_set (flag);
 	}
 
 	e_flag_wait (flag);