pidgin: 1b2d6e3c: Is it valid to use purple_timeout_remove...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 1b2d6e3c5b0a2de29e8789d768a61fd7f2a4b1da
Ancestor: c36cf6e54e25bff1ff7802082ae3c787d658187c
Author: markdoliner at pidgin.im
Date: 2008-11-25T01:32:20
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1b2d6e3c5b0a2de29e8789d768a61fd7f2a4b1da

Modified files:
        libpurple/protocols/msn/soap.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/soap.c	90b3f30fb5c1af36e8b4e5d90cb61a049f6e7245
+++ libpurple/protocols/msn/soap.c	db1771e4cd28970850a11fbf430a016158b26242
@@ -113,8 +113,8 @@ msn_soap_cleanup_for_session(gpointer da
 			&t);
 
 		if (g_hash_table_size(sess->soap_table) == 0) {
-			purple_timeout_remove(sess->soap_cleanup_handle);
 			sess->soap_cleanup_handle = 0;
+			return FALSE;
 		}
 	}