[evolution-exchange/gnome-3-0] Bug #687605(BNC) - Evolution hangs on moving email

[Bharath Acharya <abharath src gnome org>]

commit 315a4e50215d3fd2f755eb1d1c584c7d24402547
Author: Bharath Acharya <abharath novell com>
Date:   Mon Apr 25 11:22:53 2011 +0530

    Bug #687605(BNC) - Evolution hangs on moving email
    
    Handles the locks better. If there is any issue with refreshing that
    needs to be handled later.

 camel/camel-exchange-utils.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/camel/camel-exchange-utils.c b/camel/camel-exchange-utils.c
index feef990..1b0bc12 100644
--- a/camel/camel-exchange-utils.c
+++ b/camel/camel-exchange-utils.c
@@ -376,7 +376,11 @@ message_removed (ExchangeFolder *mfld, CamelFolder *folder, const gchar *href)
 		return;
 	}
 	index = find_message_index (mfld, mmsg->seq);
-	g_return_if_fail (index != -1);
+
+	if (index == -1) {
+		g_static_rec_mutex_unlock (&mfld->ed->changed_msgs_mutex);
+		return;
+	}
 
 	message_remove_at_index (mfld, folder, index);
 	g_static_rec_mutex_unlock (&mfld->ed->changed_msgs_mutex);