pidgin: 54aa7810: This should probably work a bit better. ...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 54aa781089bd7c6e106a807c3d1ea98e9898ce1e
Ancestor: 2bac1c974fbef879eca810eb3419921cbc5d2ea2
Author: qulogic at pidgin.im
Date: 2010-05-06T07:36:56
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/54aa781089bd7c6e106a807c3d1ea98e9898ce1e

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

ChangeLog: 

This should probably work a bit better. At least, we want to get rid of any
listeners when we timeout.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/directconn.c	8ec50989454c2d96ecde88963b861c37e4c6f8de
+++ libpurple/protocols/msn/directconn.c	6f29041f81fa5a8caa642974790f610124d44754
@@ -777,7 +777,7 @@ msn_dc_incoming_connection_timeout_cb(gp
 static gboolean
 msn_dc_incoming_connection_timeout_cb(gpointer data) {
 	MsnDirectConn *dc = data;
-	MsnSlpCall *slpcall = dc->slpcall;
+	MsnSlpCall *slpcall;
 
 	if (purple_debug_is_verbose())
 		purple_debug_info("msn", "msn_dc_incoming_connection_timeout_cb %p\n", dc);
@@ -785,7 +785,6 @@ msn_dc_incoming_connection_timeout_cb(gp
 	g_return_val_if_fail(dc != NULL, FALSE);
 
 	slpcall = dc->slpcall;
-	g_return_val_if_fail(slpcall != NULL, FALSE);
 
 	if (dc->listen_data != NULL) {
 		purple_network_listen_cancel(dc->listen_data);
@@ -803,10 +802,13 @@ msn_dc_incoming_connection_timeout_cb(gp
 		dc->listenfd = -1;
 	}
 
+	dc->connect_timeout_handle = 0;
 	msn_dc_destroy(dc);
-	/* Start p2p file transfer */
-	msn_slpcall_session_init(slpcall);
 
+	/* Start p2p file transfer, if possible */
+	if (slpcall)
+		msn_slpcall_session_init(slpcall);
+
 	return FALSE;
 }