# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1260127612 0
# Node ID 4e9a36bdda0fea7f225c3422ee41c6d2e211586b
# Parent  edf0aa0e55cbf1d27aad671c813d01e7f135b94d# Parent  17fed2099778b56b36411d0032d6ad538f2f7ecf
merge of 'a582dd339f019301adca693df4b1a8fb135a1774'
     and 'e2fb4cc366c55b86f89304bddac780a92ff73394'

diff -r edf0aa0e55cb -r 4e9a36bdda0f libpurple/protocols/oscar/clientlogin.c
--- 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,