# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1144624591 0
# Node ID 7337e7968654f8a7f4c2dc246d50799a3afc6570
# Parent  6fa38fadd4f833c27cadb439b4c140c61431b957
[gaim-migrate @ 15990]
Er, sorry

committer: Tailor Script <tailor@pidgin.im>

diff -r 6fa38fadd4f8 -r 7337e7968654 src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Sun Apr 09 23:06:10 2006 +0000
+++ b/src/protocols/oscar/oscar.c	Sun Apr 09 23:16:31 2006 +0000
@@ -941,6 +941,7 @@
 	NewFlapConnectionData *new_conn_data;
 	GaimConnection *gc;
 	OscarData *od;
+	GaimAccount *account;
 	FlapConnection *conn;
 
 	new_conn_data = data;
@@ -955,6 +956,7 @@
 	}
 
 	od = gc->proto_data;
+	account = gaim_connection_get_account(gc);
 	conn = new_conn_data->conn;
 	conn->fd = source;
 
@@ -978,7 +980,7 @@
 			GAIM_INPUT_READ, flap_connection_recv_cb, conn);
 	if (new_conn_data->cookie == NULL)
 	{
-		if (!((conn->type == SNAC_FAMILY_AUTH) && !aim_sn_is_icq(od->sn)))
+		if (!aim_sn_is_icq(gaim_account_get_username(account)))
 			/*
 			 * We don't send this when authenticating an ICQ account
 			 * because for some reason ICQ is still using the
@@ -992,8 +994,6 @@
 
 	if (conn->type == SNAC_FAMILY_AUTH)
 	{
-		GaimAccount *account;
-		account = gaim_connection_get_account(gc);
 		aim_request_login(od, conn, gaim_account_get_username(account));
 		gaim_debug_info("oscar", "Screen name sent, waiting for response\n");
 		gaim_connection_update_progress(gc, _("Screen name sent"), 1, OSCAR_CONNECT_STEPS);