Mercurial > pidgin3 / changeset

• changeset
• raw

changeset

If removing a timeout and return FALSE in its handler isn't good, then

Sat, 15 May 2010 08:02:08 +0000

author

Elliott Sales de Andrade <qulogic@pidgin.im>

date

Sat, 15 May 2010 08:02:08 +0000

changeset 30254

7c1f0dc0d410

parent 30253

78320fe26fa9

child 30255

47794eb7b979

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

--- 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