# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1180936606 0
# Node ID 246dc6e0014f0bb0689dcca811e37569c45bcc3d
# Parent  3bcdb320e619b6127fef390c8cdf8a6cf77a7013# Parent  0f4a562b38d155881813ad3efcef1a50fcc6f07b
merge of 'a0ccd8708935303973ab94ba534dabdc72002039'
     and 'e6f3671c41f43d240459f1c56f51decf63871c53'

diff -r 3bcdb320e619 -r 246dc6e0014f libpurple/plugins/joinpart.c
--- a/libpurple/plugins/joinpart.c	Mon Jun 04 05:56:16 2007 +0000
+++ b/libpurple/plugins/joinpart.c	Mon Jun 04 05:56:46 2007 +0000
@@ -210,7 +210,7 @@
 	 * we don't have to worry one will be called after this. */
 	g_hash_table_destroy((GHashTable *)data[0]);
 
-	g_source_remove(GPOINTER_TO_UINT(data[1]));
+	purple_timeout_remove(GPOINTER_TO_UINT(data[1]));
 	g_free(data);
 
 	return TRUE;
diff -r 3bcdb320e619 -r 246dc6e0014f libpurple/plugins/perl/perl-handlers.c
--- a/libpurple/plugins/perl/perl-handlers.c	Mon Jun 04 05:56:16 2007 +0000
+++ b/libpurple/plugins/perl/perl-handlers.c	Mon Jun 04 05:56:46 2007 +0000
@@ -184,7 +184,7 @@
 	timeout_handlers = g_list_remove(timeout_handlers, handler);
 
 	if (handler->iotag > 0)
-		g_source_remove(handler->iotag);
+		purple_timeout_remove(handler->iotag);
 
 	if (handler->callback != NULL)
 		SvREFCNT_dec(handler->callback);
@@ -405,7 +405,7 @@
 
 	timeout_handlers = g_list_append(timeout_handlers, handler);
 
-	handler->iotag = g_timeout_add(seconds * 1000, perl_timeout_cb, handler);
+	handler->iotag = purple_timeout_add(seconds * 1000, perl_timeout_cb, handler);
 }
 
 void
diff -r 3bcdb320e619 -r 246dc6e0014f libpurple/protocols/silc/silc.c
--- a/libpurple/protocols/silc/silc.c	Mon Jun 04 05:56:16 2007 +0000
+++ b/libpurple/protocols/silc/silc.c	Mon Jun 04 05:56:46 2007 +0000
@@ -361,7 +361,7 @@
 	}
 
 	/* Schedule SILC using Glib's event loop */
-	sg->scheduler = g_timeout_add(300, (GSourceFunc)silcpurple_scheduler, sg);
+	sg->scheduler = purple_timeout_add(300, (GSourceFunc)silcpurple_scheduler, sg);
 }
 
 static int
@@ -392,8 +392,8 @@
 	if (sg->conn)
 		silc_client_close_connection(sg->client, sg->conn);
 
-	g_source_remove(sg->scheduler);
-	g_timeout_add(1, (GSourceFunc)silcpurple_close_final, sg);
+	purple_timeout_remove(sg->scheduler);
+	purple_timeout_add(1, (GSourceFunc)silcpurple_close_final, sg);
 }