pidgin: e6553be8: Add back Paul's error message from revis...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: e6553be8b988c18b57944cd41d2d63819e504967
Ancestor: 0bb56c61f60a93fff0f712dbb59d3461f474b2db
Author: markdoliner at pidgin.im
Date: 2010-02-07T09:30:49
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e6553be8b988c18b57944cd41d2d63819e504967

Modified files:
        libpurple/protocols/oscar/clientlogin.c

ChangeLog: 

Add back Paul's error message from revision 219b3128f3d96b126a9ed9aff2d2f3277e69dbd4
(disapproved in revision e2fb4cc366c55b86f89304bddac780a92ff73394) with
a slightly improved error message.  Thanks for adding this in the first place,
Paul!  Sorry it took me months to re-instate it after I complained!

Hopefully AOL won't start asking users to fill out CAPTCHAs in order to
log in, because that would be messy (both our implementation and the
user experience).

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/clientlogin.c	4ea8f551f91a8fd94dc0b22d888bc0ca107849c7
+++ libpurple/protocols/oscar/clientlogin.c	d1110c449c4c558d139dffc12b0a941191ac8837
@@ -413,6 +413,11 @@ static gboolean parse_client_login_respo
 			purple_connection_error_reason(gc,
 					PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED,
 					_("Incorrect password"));
+		} else if (status_code == 330 && status_detail_code == 3015) {
+			purple_connection_error_reason(gc,
+					PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED,
+					_("Server requested that you fill out a CAPTCHA in order to "
+					"sign in, but this client does not currently support CAPTCHAs."));
 		} else if (status_code == 401 && status_detail_code == 3019) {
 			purple_connection_error_reason(gc,
 					PURPLE_CONNECTION_ERROR_OTHER_ERROR,