evolution-exchange r1545 - in trunk: . camel

[mbarnes svn gnome org]

Author: mbarnes
Date: Mon Jan 21 13:13:51 2008
New Revision: 1545
URL: http://svn.gnome.org/viewvc/evolution-exchange?rev=1545&view=rev

Log:
2008-01-21  Matthew Barnes  <mbarnes redhat com>

	* configure.in:
	Require camel-1.2 >= 2.21.90 for
	camel_session_build_password_prompt().

	* camel/camel-exchange-store.c (camel_exchange_get_password):
	Use camel_session_build_password_prompt() to build a consistently
	worded prompt message for the password dialog.



Modified:
   trunk/ChangeLog
   trunk/camel/camel-exchange-store.c
   trunk/configure.in

Modified: trunk/camel/camel-exchange-store.c
==============================================================================
--- trunk/camel/camel-exchange-store.c	(original)
+++ trunk/camel/camel-exchange-store.c	Mon Jan 21 13:13:51 2008
@@ -347,17 +347,17 @@
 camel_exchange_get_password (CamelService *service, CamelException *ex)
 {
 	CamelSession *session = camel_service_get_session (service);
-	char *prompt, *account_name;
 
 	if (!service->url->passwd) {
-		/* This is a hack to use the same string being used in
-		   exchange-account.c:get_password */
-		account_name = g_strdup_printf ("%s %s", service->url->user, service->url->host);
-		prompt = g_strdup_printf (_("%sEnter password for %s"), "", account_name);
-
-		service->url->passwd = camel_session_get_password (session,
-					service, "Exchange", prompt, "password", CAMEL_SESSION_PASSWORD_SECRET, ex);
-		g_free (account_name);
+		gchar *prompt;
+
+		prompt = camel_session_build_password_prompt (
+			"Exchange", service->url->user, service->url->host);
+
+		service->url->passwd = camel_session_get_password (
+			session, service, "Exchange", prompt,
+			"password", CAMEL_SESSION_PASSWORD_SECRET, ex);
+
 		g_free (prompt);
 	}
 }

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Jan 21 13:13:51 2008
@@ -6,6 +6,7 @@
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
 # Required Package Versions
+m4_define([camel_minimum_version], [2.21.90])
 m4_define([glib_minimum_version], [2.15.3])
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([gconf_minimum_version], [2.0.0])             # XXX Just a Guess
@@ -103,6 +104,7 @@
 PKG_CHECK_MODULES(GNOME_PLATFORM,
 	[glib-2.0 >= glib_minimum_version
 	 gtk+-2.0 >= gtk_minimum_version
+	 camel-1.2 >= camel_minimum_version
 	 gconf-2.0 >= gconf_minimum_version
 	 libbonobo-2.0 >= libbonobo_minimum_version
 	 libglade-2.0 >= libglade_minimum_version