# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 1003255875 0
# Node ID 3ec36a3424967e7a59f1baabe9a90f14610bcf5f
# Parent  6fffd664b78ab2475c9e05ffc5caac5f8534c280
[gaim-migrate @ 2528]
this is better, hopefully.

committer: Tailor Script <tailor@pidgin.im>

diff -r 6fffd664b78a -r 3ec36a342496 src/protocols/icq/gaim_icq.c
--- a/src/protocols/icq/gaim_icq.c	Tue Oct 16 01:12:36 2001 +0000
+++ b/src/protocols/icq/gaim_icq.c	Tue Oct 16 18:11:15 2001 +0000
@@ -18,6 +18,7 @@
 struct icq_data {
 	icq_Link *link;
 	int cur_status;
+	gboolean connected;
 };
 
 static guint ack_timer = 0;
@@ -79,8 +80,8 @@
 	struct gaim_connection *gc = link->icq_UserData;
 	struct icq_data *id = (struct icq_data *)gc->proto_data;
 	debug_printf("%s is now online.\n", gc->username);
+	id->connected = TRUE;
 	account_online(gc);
-	/*gc->options |= OPT_USR_KEEPALV; this is always-on now */
 	serv_finish_login(gc);
 
 	icq_ChangeStatus(id->link, STATUS_ONLINE);
@@ -90,6 +91,12 @@
 	struct gaim_connection *gc = link->icq_UserData;
 	struct icq_data *id = (struct icq_data *)gc->proto_data;
 
+	if (!id->connected) {
+		hide_login_progress(gc, "Unable to connect");
+		signoff(gc);
+		return;
+	}
+
 	if (icq_Connect(link, "icq.mirabilis.com", 4000) < 1) {
 		hide_login_progress(gc, "Unable to connect");
 		signoff(gc);