# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1151131631 0
# Node ID 84f2675cf87f89fac9d446e55143cad18546a937
# Parent  55fb5cd9bac9fad19bcb171a919ad334802a609d
[gaim-migrate @ 16324]
Handle the oscar icon retrieval timer loop in a slightly more
clear way.

committer: Tailor Script <tailor@pidgin.im>

diff -r 55fb5cd9bac9 -r 84f2675cf87f src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Fri Jun 23 20:42:25 2006 +0000
+++ b/src/protocols/oscar/oscar.c	Sat Jun 24 06:47:11 2006 +0000
@@ -1113,9 +1113,8 @@
 
 	od->iconconnecting = FALSE;
 
-	if (od->icontimer)
-		gaim_timeout_remove(od->icontimer);
-	od->icontimer = gaim_timeout_add(100, gaim_icon_timerfunc, gc);
+	if (od->icontimer == 0)
+		od->icontimer = gaim_timeout_add(100, gaim_icon_timerfunc, gc);
 }
 
 static int
@@ -1815,9 +1814,8 @@
 				cur = cur->next;
 			if (!cur) {
 				od->requesticon = g_slist_append(od->requesticon, g_strdup(gaim_normalize(account, info->sn)));
-				if (od->icontimer)
-					gaim_timeout_remove(od->icontimer);
-				od->icontimer = gaim_timeout_add(500, gaim_icon_timerfunc, gc);
+				if (od->icontimer == 0)
+					od->icontimer = gaim_timeout_add(500, gaim_icon_timerfunc, gc);
 			}
 		}
 		g_free(b16);
@@ -3169,9 +3167,8 @@
 	od->requesticon = g_slist_remove(od->requesticon, sn);
 	g_free(sn);
 
-	if (od->icontimer)
-		gaim_timeout_remove(od->icontimer);
-	od->icontimer = gaim_timeout_add(500, gaim_icon_timerfunc, gc);
+	if (od->icontimer == 0)
+		od->icontimer = gaim_timeout_add(500, gaim_icon_timerfunc, gc);
 
 	return 1;
 }
@@ -3221,9 +3218,8 @@
 			cur = cur->next;
 	}
 
-	if (od->icontimer)
-		gaim_timeout_remove(od->icontimer);
-	od->icontimer = gaim_timeout_add(250, gaim_icon_timerfunc, gc);
+	if (od->icontimer == 0)
+		od->icontimer = gaim_timeout_add(250, gaim_icon_timerfunc, gc);
 
 	return 1;
 }
@@ -3234,6 +3230,8 @@
 	aim_userinfo_t *userinfo;
 	FlapConnection *conn;
 
+	od->icontimer = 0;
+
 	conn = flap_connection_getbytype(od, SNAC_FAMILY_BART);
 	if (!conn) {
 		if (!od->iconconnecting) {
@@ -3286,7 +3284,9 @@
 		g_free(sn);
 	}
 
-	return TRUE;
+	od->icontimer = gaim_timeout_add(100, gaim_icon_timerfunc, gc);
+
+	return FALSE;
 }
 
 /*