[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.304,1.305

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory sc8-pr-cvs1:/tmp/cvs-serv14156/src/protocols/oscar

Modified Files:
	oscar.c 
Log Message:
Roald Dahl is the man.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -d -r1.304 -r1.305
--- oscar.c	18 Mar 2003 16:42:04 -0000	1.304
+++ oscar.c	18 Mar 2003 17:25:44 -0000	1.305
@@ -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;
 	}