[evolution-mapi/gnome-3-8] Bug #702276 - Deadlock when connecting to a server

[Milan Crha <mcrha src gnome org>]

commit fdc7aea82174b531f413855fbf9a9ccf0cd7e664
Author: Milan Crha <mcrha redhat com>
Date:   Fri Jun 14 20:31:58 2013 +0200

    Bug #702276 - Deadlock when connecting to a server

 src/camel/camel-mapi-store.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/src/camel/camel-mapi-store.c b/src/camel/camel-mapi-store.c
index 6b01562..900a48f 100644
--- a/src/camel/camel-mapi-store.c
+++ b/src/camel/camel-mapi-store.c
@@ -2952,9 +2952,14 @@ camel_mapi_store_ref_connection (CamelMapiStore *mapi_store,
        g_return_val_if_fail (mapi_store->priv != NULL, NULL);
 
        g_rec_mutex_lock (&mapi_store->priv->connection_lock);
-       if (!mapi_store->priv->connection)
+       if (!mapi_store->priv->connection) {
+               g_rec_mutex_unlock (&mapi_store->priv->connection_lock);
+
                camel_mapi_store_connected (mapi_store, cancellable, error);
 
+               g_rec_mutex_lock (&mapi_store->priv->connection_lock);
+       }
+
        conn = mapi_store->priv->connection;
        if (conn)
                g_object_ref (conn);