Mercurial > pidgin.yaz
changeset 30681:c8cf189bf6db
jabber: This is more accurate, I think (e.g. Cyrus doesn't know what SCRAM-SHA-1 is)
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 08 Jul 2010 21:25:17 +0000 |
| parents | eeee406244da |
| children | 22afdd5a9290 |
| files | libpurple/protocols/jabber/auth_cyrus.c |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/auth_cyrus.c Thu Jul 08 02:13:38 2010 +0000 +++ b/libpurple/protocols/jabber/auth_cyrus.c Thu Jul 08 21:25:17 2010 +0000 @@ -36,7 +36,7 @@ { 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 @@ * 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"),