# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 982783047 0
# Node ID e12fa57b9ef967d4f57e93cbc35021f97d1f3953
# Parent  638b57b1801d1ecdd126ed947a49153656a32186
[gaim-migrate @ 1503]
icq works again :-P

committer: Tailor Script <tailor@pidgin.im>

diff -r 638b57b1801d -r e12fa57b9ef9 plugins/icq/gaim_icq.c
--- a/plugins/icq/gaim_icq.c	Sat Feb 17 00:08:45 2001 +0000
+++ b/plugins/icq/gaim_icq.c	Wed Feb 21 19:17:27 2001 +0000
@@ -97,10 +97,6 @@
 	gc->options |= OPT_USR_KEEPALV;
 	serv_finish_login(gc);
 
-	icq_ContactClear(id->link);
-	if (bud_list_cache_exists(gc))
-		do_import(NULL, gc);
-
 	icq_ChangeStatus(id->link, STATUS_ONLINE);
 }
 
@@ -245,9 +241,6 @@
 	struct icq_data *id = gc->proto_data = g_new0(struct icq_data, 1);
 	ICQLINK *link;
 
-	if (!icq_SocketNotify)
-		icq_SocketNotify = icq_sock_notify;
-
 	icq_LogLevel = ICQ_LOG_MESSAGE;
 
 	link = id->link = icq_ICQLINKNew(atol(user->username), user->password,
@@ -269,6 +262,10 @@
 	link->icq_Log = icq_do_log;
 	link->icq_SetTimeout = icq_set_timeout;
 
+	icq_ContactClear(id->link);
+	if (bud_list_cache_exists(gc))
+		do_import(NULL, gc);
+
 	icq_UnsetProxy(link);
 
 	if (icq_Connect(link, "icq.mirabilis.com", 4000) < 1) {
@@ -483,6 +480,7 @@
 }
 
 char *gaim_plugin_init(GModule *handle) {
+	icq_SocketNotify = icq_sock_notify;
 	load_protocol(icq_init, sizeof(struct prpl));
 	return NULL;
 }