# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1273910528 0
# Node ID 783d736704b85435346d6ff56f94408646703f04
# Parent  4463cd2aba2d039810331996f229d6078a4a078a
If removing a timeout and return FALSE in its handler isn't good, then
returning TRUE probably isn't either.

diff -r 4463cd2aba2d -r 783d736704b8 libpurple/protocols/msn/directconn.c
--- a/libpurple/protocols/msn/directconn.c	Fri May 14 06:57:26 2010 +0000
+++ b/libpurple/protocols/msn/directconn.c	Sat May 15 08:02:08 2010 +0000
@@ -724,12 +724,14 @@
 
 	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