Mercurial > pidgin3 / changeset

• changeset
• raw

changeset

purple_timeout_remove(), not g_source_remove(), must be used to remove a timeout added by purple_timeout_add(). The latter works when the glib run loop is being used but not when any other eventloop implementation is in use.

Fri, 28 Dec 2007 05:54:50 +0000

author

Evan Schoenberg <evands@pidgin.im>

date

Fri, 28 Dec 2007 05:54:50 +0000

changeset 22067

bb6fd6d794b5

parent 22066

bbee682c0646

child 22068

5157ec7a2b6f

purple_timeout_remove(), not g_source_remove(), must be used to remove a timeout added by purple_timeout_add(). The latter works when the glib run loop is being used but not when any other eventloop implementation is in use.

--- a/libpurple/protocols/jabber/jabber.c	Fri Dec 28 02:49:23 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Fri Dec 28 05:54:50 2007 +0000
@@ -390,7 +390,7 @@
 
 static void jabber_pong_cb(JabberStream *js, xmlnode *packet, gpointer timeout) 
 {
-	g_source_remove(GPOINTER_TO_INT(timeout));
+	purple_timeout_remove(GPOINTER_TO_INT(timeout));
 }
 
 static gboolean jabber_pong_timeout(PurpleConnection *gc)