Mercurial > pidgin.yaz

diff src/protocols/oscar/oscar.c @ 8287:ef881489396e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 9011] Another patch from Scott Lamb to change g_source_remove calls to gaim_timeout_remove. It also implements gaim_timeout_remove. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Wed, 18 Feb 2004 07:43:21 +0000
parents f24172f53650
children 34e8ad866f12
line wrap: on
line diff
--- a/src/protocols/oscar/oscar.c	Wed Feb 18 07:22:53 2004 +0000
+++ b/src/protocols/oscar/oscar.c	Wed Feb 18 07:43:21 2004 +0000
@@ -790,9 +790,9 @@
 	if (od->icopa > 0)
 		gaim_input_remove(od->icopa);
 	if (od->icontimer > 0)
-		g_source_remove(od->icontimer);
+		gaim_timeout_remove(od->icontimer);
 	if (od->getblisttimer)
-		g_source_remove(od->getblisttimer);
+		gaim_timeout_remove(od->getblisttimer);
 	aim_session_kill(od->sess);
 	g_free(od->sess);
 	od->sess = NULL;
@@ -1463,7 +1463,7 @@
 	od->iconconnecting = FALSE;
 
 	if (od->icontimer)
-		g_source_remove(od->icontimer);
+		gaim_timeout_remove(od->icontimer);
 	od->icontimer = gaim_timeout_add(100, gaim_icon_timerfunc, gc);
 
 	return 1;
@@ -1882,7 +1882,7 @@
 			if (!cur) {
 				od->requesticon = g_slist_append(od->requesticon, g_strdup(gaim_normalize(gc->account, info->sn)));
 				if (od->icontimer)
-					g_source_remove(od->icontimer);
+					gaim_timeout_remove(od->icontimer);
 				od->icontimer = gaim_timeout_add(500, gaim_icon_timerfunc, gc);
 			}
 		}
@@ -3496,7 +3496,7 @@
 	free(sn);
 
 	if (od->icontimer)
-		g_source_remove(od->icontimer);
+		gaim_timeout_remove(od->icontimer);
 	od->icontimer = gaim_timeout_add(500, gaim_icon_timerfunc, gc);
 
 	return 1;
@@ -3544,7 +3544,7 @@
 	}
 
 	if (od->icontimer)
-		g_source_remove(od->icontimer);
+		gaim_timeout_remove(od->icontimer);
 	od->icontimer = gaim_timeout_add(250, gaim_icon_timerfunc, gc);
 
 	return 1;