# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1048008344 0
# Node ID 4a376a305fa551e23bc2e82d49dfbbe25154f2b6
# Parent  c107020b25eec5771b7abadad835eebc8e9733fa
[gaim-migrate @ 5148]
Roald Dahl is the man.

committer: Tailor Script <tailor@pidgin.im>

diff -r c107020b25ee -r 4a376a305fa5 src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Tue Mar 18 16:42:04 2003 +0000
+++ b/src/protocols/oscar/oscar.c	Tue Mar 18 17:25:44 2003 +0000
@@ -89,6 +89,8 @@
 	guint emlpa;
 	guint icopa;
 
+	gboolean iconconnecting;
+
 	GSList *create_rooms;
 
 	gboolean conf;
@@ -1380,6 +1382,8 @@
 
 	aim_clientready(sess, fr->conn);
 
+	od->iconconnecting = FALSE;
+
 	if (od->icontimer)
 		g_source_remove(od->icontimer);
 	od->icontimer = g_timeout_add(100, gaim_icon_timerfunc, gc);
@@ -1639,11 +1643,6 @@
 	} break;
 
 	case 0x0010: { /* icon */
-		if (od->icopa > 0)
-			gaim_input_remove(od->icopa);
-		while ((tstconn = aim_conn_findbygroup(sess, 0x0010)))
-			aim_conn_kill(sess, &tstconn);
-
 		if (!(tstconn = aim_newconn(sess, AIM_CONN_TYPE_ICON, NULL))) {
 			debug_printf("unable to connect to icon server\n");
 			g_free(host);
@@ -3397,8 +3396,9 @@
 	}
 
 	conn = aim_getconn_type(od->sess, AIM_CONN_TYPE_ICON);
-	if (!conn) {
+	if (!conn && !od->iconconnecting) {
 		aim_reqservice(od->sess, od->conn, AIM_CONN_TYPE_ICON);
+		od->iconconnecting = TRUE;
 		return FALSE;
 	}