[evolution-mapi/gnome-3-2] Bug #664062 - Profile name not saved in transport URL

[Milan Crha <mcrha src gnome org>]

commit 68c1667fed008cd0496132c47793c48089b8a38e
Author: Milan Crha <mcrha redhat com>
Date:   Thu Nov 24 14:54:57 2011 +0100

    Bug #664062 - Profile name not saved in transport URL

 src/camel/camel-mapi-transport.c |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/src/camel/camel-mapi-transport.c b/src/camel/camel-mapi-transport.c
index ba31a6d..4e8f524 100644
--- a/src/camel/camel-mapi-transport.c
+++ b/src/camel/camel-mapi-transport.c
@@ -107,6 +107,34 @@ mapi_send_to_sync (CamelTransport *transport,
 	service = CAMEL_SERVICE (transport);
 	settings = camel_service_get_settings (service);
 	profile = camel_mapi_settings_get_profile (CAMEL_MAPI_SETTINGS (settings));
+	if (!profile) {
+		/* try to find corresponding CamelStore with profile name filled */
+		const gchar *my_uid = camel_service_get_uid (service);
+		CamelSession *session = camel_service_get_session (service);
+		GList *services, *s;
+
+		services = camel_session_list_services (session);
+		for (s = services; s && my_uid && !profile; s = s->next) {
+			CamelService *store = s->data;
+			const gchar *store_uid;
+
+			if (!CAMEL_IS_STORE (store))
+				continue;
+
+			store_uid = camel_service_get_uid (store);
+			if (!store_uid)
+				continue;
+
+			if (g_strcmp0 (my_uid, store_uid) == 0 ||
+			    g_str_has_prefix (my_uid, store_uid) ||
+			    g_str_has_prefix (store_uid, my_uid)) {
+				settings = camel_service_get_settings (store);
+				profile = camel_mapi_settings_get_profile (CAMEL_MAPI_SETTINGS (settings));
+			}
+		}
+
+		g_list_free (services);
+	}
 
 	conn = exchange_mapi_connection_find (profile);
 	if (!conn) {