[evolution-mapi/gnome-2-30] Bug #620095 - Deadlock while filling folder list in Contacts

[Milan Crha <mcrha src gnome org>]

commit d46f5bf421588a0e8e16cc91d0c59c42d87de98a
Author: Oded Arbel <oded geek co il>
Date:   Mon May 31 20:16:58 2010 +0200

    Bug #620095 - Deadlock while filling folder list in Contacts

 .../exchange-mapi-account-setup.c                  |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/src/account-setup-eplugin/exchange-mapi-account-setup.c b/src/account-setup-eplugin/exchange-mapi-account-setup.c
index 9b55f65..5724885 100644
--- a/src/account-setup-eplugin/exchange-mapi-account-setup.c
+++ b/src/account-setup-eplugin/exchange-mapi-account-setup.c
@@ -392,7 +392,6 @@ check_node (GtkTreeStore *ts, ExchangeMAPIFolder *folder, GtkTreeIter iter)
 {
 	GtkTreeModel *ts_model;
 	mapi_id_t fid;
-	gboolean status = FALSE;
 
 	ts_model = GTK_TREE_MODEL (ts);
 	
@@ -408,14 +407,15 @@ check_node (GtkTreeStore *ts, ExchangeMAPIFolder *folder, GtkTreeIter iter)
 	if (gtk_tree_model_iter_has_child (ts_model, &iter)) {
 		GtkTreeIter child;
 		gtk_tree_model_iter_children (ts_model, &child, &iter);
-		status = check_node (ts, folder, child);
+		if (check_node (ts, folder, child))
+		    return TRUE;
 	}
 
-	while (gtk_tree_model_iter_next (ts_model, &iter) && !status) {
-		status = check_node (ts, folder, iter);
+	if (gtk_tree_model_iter_next (ts_model, &iter)) {
+		return check_node (ts, folder, iter);
 	}
 
-	return status;
+	return FALSE;
 }
 
 static void