cpw.rekkanoryo.icqmd5auth: 346c4d5c: Patch from 'db42' to enable MD5 auth on ...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 346c4d5ca1e54139bd6af4f3e4097f42cdf043be
Ancestor: 0b212d0b7f8c5aab4b8e6bae9dadfe410620f552
Author: rekkanoryo at pidgin.im
Date: 2008-11-15T21:29:38
Branch: im.pidgin.cpw.rekkanoryo.icqmd5auth
URL: http://d.pidgin.im/viewmtn/revision/info/346c4d5ca1e54139bd6af4f3e4097f42cdf043be

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

ChangeLog: 

Patch from 'db42' to enable MD5 auth on ICQ.  Refs #4449.  Before I merge
this back to im.pidgin.pidgin I want to get a prompt in here to let the user
fail over to the XOR method if MD5 fails.  I suspect this won't be necessary
though.

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/family_auth.c	edc3dea4a619d3b826873b9741ab93cedceb8437
+++ libpurple/protocols/oscar/family_auth.c	83e740ae17078bc10989614344ea50a985722944
@@ -32,7 +32,7 @@
 
 #include <ctype.h>
 
-#define USE_XOR_FOR_ICQ
+/* #define USE_XOR_FOR_ICQ */
 
 #ifdef USE_XOR_FOR_ICQ
 /**
============================================================
--- libpurple/protocols/oscar/oscar.c	fccf04c11d8a2b4ecb784e6fdfd6473da13a9030
+++ libpurple/protocols/oscar/oscar.c	2002dfbd9a4c56f8c69bf75a6ea4409f8427035d
@@ -1142,15 +1142,7 @@ connection_established_cb(gpointer data,
 	conn->watcher_incoming = purple_input_add(conn->fd,
 			PURPLE_INPUT_READ, flap_connection_recv_cb, conn);
 	if (conn->cookie == NULL)
-	{
-		if (!aim_snvalid_icq(purple_account_get_username(account)))
-			/*
-			 * We don't send this when authenticating an ICQ account
-			 * because for some reason ICQ is still using the
-			 * assy/insecure authentication procedure.
-			 */
 			flap_connection_send_version(od, conn);
-	}
 	else
 	{
 		flap_connection_send_version_with_cookie(od, conn,