pidgin: ab3ac3a2: Use msn_dc_fallback_to_p2p where possibl...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: ab3ac3a20bc3cbc0c4cb22e68f8b33ca6a5f0f87
Ancestor: 34d20eeb6a0c92c2e677ee6da6e1352688f9a52f
Author: qulogic at pidgin.im
Date: 2010-05-17T08:42:51
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ab3ac3a20bc3cbc0c4cb22e68f8b33ca6a5f0f87

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

ChangeLog: 

Use msn_dc_fallback_to_p2p where possible.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/directconn.c	8cdf6ff36e430c4000f46484f2622cc634c62054
+++ libpurple/protocols/msn/directconn.c	5d2d178483f39ba9889d06d4c9976c95eb59c591
@@ -323,11 +323,11 @@ msn_dc_fallback_to_p2p(MsnDirectConn *dc
 	g_return_if_fail(dc != NULL);
 
 	slpcall = dc->slpcall;
-	g_return_if_fail(slpcall != NULL);
 
 	msn_dc_destroy(dc);
 
-	msn_slpcall_session_init(slpcall);
+	if (slpcall)
+		msn_slpcall_session_init(slpcall);
 }
 
 static void
@@ -805,12 +805,8 @@ msn_dc_incoming_connection_timeout_cb(gp
 	}
 
 	dc->connect_timeout_handle = 0;
-	msn_dc_destroy(dc);
+	msn_dc_fallback_to_p2p(dc);
 
-	/* Start p2p file transfer, if possible */
-	if (slpcall)
-		msn_slpcall_session_init(slpcall);
-
 	return FALSE;
 }
 
@@ -867,12 +863,7 @@ msn_dc_outgoing_connection_timeout_cb(gp
 		 * Both internal and external connection attempts failed.
 		 * Fall back to p2p transfer.
 		 */
-		MsnSlpCall *slpcall = dc->slpcall;
-
-		msn_dc_destroy(dc);
-		/* Start p2p file transfer, if possible */
-		if (slpcall)
-			msn_slpcall_session_init(slpcall);
+		msn_dc_fallback_to_p2p(dc);
 	}
 
 	return FALSE;