# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1265535049 0
# Node ID e1dd357fc4946f2b7824565c51c9316af51f0381
# Parent  acf7f763766939f32fbed6586e69dcb387ed3f90
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).

diff -r acf7f7637669 -r e1dd357fc494 libpurple/protocols/oscar/clientlogin.c
--- a/libpurple/protocols/oscar/clientlogin.c	Sun Feb 07 08:43:26 2010 +0000
+++ b/libpurple/protocols/oscar/clientlogin.c	Sun Feb 07 09:30:49 2010 +0000
@@ -413,6 +413,11 @@
 			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,