[Gaim-commits] SF.net SVN: gaim: [16325] branches/v2_0_0/src/protocols/oscar/oscar.c

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

Revision: 16325
Author:   thekingant
Date:     2006-06-23 23:47:39 -0700 (Fri, 23 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16325&view=rev

Log Message:
-----------
Backport SVN revision #16324 from HEAD to v2_0_0.
Original commit message:

Handle the oscar icon retrieval timer loop in a slightly more
clear way.

ViewCVS Links:
-------------
    http://svn.sourceforge.net/gaim/?rev=16324&view=rev

Modified Paths:
--------------
    branches/v2_0_0/src/protocols/oscar/oscar.c
Modified: branches/v2_0_0/src/protocols/oscar/oscar.c
===================================================================
--- branches/v2_0_0/src/protocols/oscar/oscar.c	2006-06-24 06:47:11 UTC (rev 16324)
+++ branches/v2_0_0/src/protocols/oscar/oscar.c	2006-06-24 06:47:39 UTC (rev 16325)
@@ -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);
@@ -3168,9 +3166,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;
 }
@@ -3220,9 +3217,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;
 }
@@ -3233,6 +3229,8 @@
 	aim_userinfo_t *userinfo;
 	FlapConnection *conn;
 
+	od->icontimer = 0;
+
 	conn = flap_connection_getbytype(od, SNAC_FAMILY_BART);
 	if (!conn) {
 		if (!od->iconconnecting) {
@@ -3285,7 +3283,9 @@
 		g_free(sn);
 	}
 
-	return TRUE;
+	od->icontimer = gaim_timeout_add(100, gaim_icon_timerfunc, gc);
+
+	return FALSE;
 }
 
 /*


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.