pidgin: d63a5c46: jabber: This is more accurate, I think (...

[darkrain42 at pidgin.im]

----------------------------------------------------------------------
Revision: d63a5c469df95420fc1e1b38df6be9c75ba25d40
Parent:   05feb74c1c6c8043bd8a617ae0f523fbc7a24cec
Author:   darkrain42 at pidgin.im
Date:     07/08/10 17:25:17
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d63a5c469df95420fc1e1b38df6be9c75ba25d40

Changelog: 

jabber: This is more accurate, I think (e.g. Cyrus doesn't know what SCRAM-SHA-1 is)

Changes against parent 05feb74c1c6c8043bd8a617ae0f523fbc7a24cec

  patched  libpurple/protocols/jabber/auth_cyrus.c

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/auth_cyrus.c	4b15693ad4c1683516c1a26132737e98e4e4f471
+++ libpurple/protocols/jabber/auth_cyrus.c	d20e17ee1f9706f5df1b6276856608354e6ac056
@@ -36,7 +36,7 @@ static void disallow_plaintext_auth(Purp
 {
 	purple_connection_error_reason(purple_account_get_connection(account),
 		PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
-		_("Server requires plaintext authentication over an unencrypted stream"));
+		_("Server may require plaintext authentication over an unencrypted stream"));
 }
 
 static void start_cyrus_wrapper(JabberStream *js)
@@ -240,8 +240,9 @@ jabber_auth_start_cyrus(JabberStream *js
 				 * it in plaintext, see if we can turn on
 				 * plaintext auth
 				 */
+				/* XXX Should we just check for PLAIN/LOGIN being offered mechanisms? */
 				} else if (!plaintext) {
-					char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"),
+					char *msg = g_strdup_printf(_("%s may require plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"),
 							purple_account_get_username(account));
 					purple_request_yes_no(js->gc, _("Plaintext Authentication"),
 							_("Plaintext Authentication"),