changeset 28766:4e9a36bdda0f

merge of 'a582dd339f019301adca693df4b1a8fb135a1774' and 'e2fb4cc366c55b86f89304bddac780a92ff73394'
author Paul Aurich <paul@darkrain42.org>
date Sun, 06 Dec 2009 19:26:52 +0000
parents edf0aa0e55cb (current diff) 17fed2099778 (diff)
children 9ab75ab032b4
files
diffstat 1 files changed, 0 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/oscar/clientlogin.c	Sun Dec 06 04:31:39 2009 +0000
+++ b/libpurple/protocols/oscar/clientlogin.c	Sun Dec 06 19:26:52 2009 +0000
@@ -393,10 +393,6 @@
 			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,
-					_("CAPTCHA requested. Logging into the AIM/ICQ website may fix this."));
 		} else if (status_code == 401 && status_detail_code == 3019) {
 			purple_connection_error_reason(gc,
 					PURPLE_CONNECTION_ERROR_OTHER_ERROR,