# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1227576740 0
# Node ID b68a672b645dbb0f8f0ebd92836cf5ee86a42f7a
# Parent  88955b9181972159f7a01f5bee0471e1e5169a59
Is it valid to use purple_timeout_remove() to remove a timer when
you're inside the callback for that timer?  I don't know, but I
do know that it's valid to return FALSE to cancel the timer.  And
I think this is cleaner.

diff -r 88955b918197 -r b68a672b645d libpurple/protocols/msn/soap.c
--- a/libpurple/protocols/msn/soap.c	Wed Nov 19 03:08:57 2008 +0000
+++ b/libpurple/protocols/msn/soap.c	Tue Nov 25 01:32:20 2008 +0000
@@ -113,8 +113,8 @@
 			&t);
 
 		if (g_hash_table_size(sess->soap_table) == 0) {
-			purple_timeout_remove(sess->soap_cleanup_handle);
 			sess->soap_cleanup_handle = 0;
+			return FALSE;
 		}
 	}