pidgin: 960f413c: If removing a timeout and return FALSE i...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 960f413c5f1317a2d152f0b0571357d8196ec8e6
Ancestor: 7b2b0392fe4ca968ebc6a2e623521ca4d8014024
Author: qulogic at pidgin.im
Date: 2010-05-15T08:02:08
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/960f413c5f1317a2d152f0b0571357d8196ec8e6

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

ChangeLog: 

If removing a timeout and return FALSE in its handler isn't good, then
returning TRUE probably isn't either.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/directconn.c	92251e3e7adb502f12a343e5072c05ff5f6b2e3e
+++ libpurple/protocols/msn/directconn.c	052fdfd402fda13aee6ab540222fad678f298173
@@ -724,12 +724,14 @@ msn_dc_timeout(gpointer data)
 
 	g_return_val_if_fail(dc != NULL, FALSE);
 
-	if (dc->progress)
+	if (dc->progress) {
 		dc->progress = FALSE;
-	else
+		return TRUE;
+	} else {
+		dc->timeout_handle = 0;
 		msn_dc_destroy(dc);
-
-	return TRUE;
+		return FALSE;
+	}
 }
 
 static void