evolution-data-server r8685 - branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi

[msuman svn gnome org]

Author: msuman
Date: Mon Apr 28 03:34:55 2008
New Revision: 8685
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8685&view=rev

Log:
Use a common password component across e-d-s, Camel and Evolution for a MAPI account

Modified:
   branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/ChangeLog
   branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-store.c

Modified: branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-store.c
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-store.c	(original)
+++ branches/EXCHANGE_MAPI_BRANCH/camel/providers/mapi/camel-mapi-store.c	Mon Apr 28 03:34:55 2008
@@ -48,6 +48,9 @@
 //#include <mapi/exchange-mapi-folder.h>
 //#define d(x) x
 
+/* This definition should be in-sync with those in exchange-mapi-account-setup.c and exchange-account-listener.c */
+#define E_PASSWORD_COMPONENT "ExchangeMAPI"
+
 #include <sys/types.h>
 #include <stdint.h>
 #include <stdbool.h>
@@ -302,7 +305,7 @@
 	while (!authenticated) {
 		if (errbuf) {
 			/* We need to un-cache the password before prompting again */
-			camel_session_forget_password (session, service, "Mapi", "password", ex);
+			camel_session_forget_password (session, service, E_PASSWORD_COMPONENT, "password", ex);
 			g_free (service->url->passwd);
 			service->url->passwd = NULL;
 		}
@@ -316,7 +319,7 @@
 						  service->url->user,
 						  service->url->host);
 			service->url->passwd =
-				camel_session_get_password (session, service, "Mapi",
+				camel_session_get_password (session, service, E_PASSWORD_COMPONENT,
 							    prompt, "password", CAMEL_SESSION_PASSWORD_SECRET, ex);
 			g_free (prompt);
 			g_free (errbuf);