pidgin: 21770e76: A direct connection shouldn't be FT-only...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 21770e7623975c57f0e50da6b69b6223e52a4df0
Ancestor: 2cb0283c188e5cd3d703f1ca8194eabdb347f053
Author: qulogic at pidgin.im
Date: 2010-04-23T20:45:05
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/21770e7623975c57f0e50da6b69b6223e52a4df0

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

ChangeLog: 

A direct connection shouldn't be FT-only.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/slp.c	6026e2f56ae3b2c299decbebe4a08dfcf292b1b4
+++ libpurple/protocols/msn/slp.c	beb15658cc8302f02bfc52a5fcf7d0ce968bfa76
@@ -222,15 +222,6 @@ msn_slp_send_ok(MsnSlpCall *slpcall, con
 	slpmsg->text_body = TRUE;
 
 	msn_slplink_queue_slpmsg(slplink, slpmsg);
-
-	/*
-	 * TODO: Removed because it interferes with
-	 * direct file transfer. If we're sending some file
-	 * then this call initiates a p2p file transfer which is
-	 * undesirable.
-	 */
-
-	/* msn_slpcall_session_init(slpcall); */
 }
 
 void
@@ -636,8 +627,6 @@ got_invite(MsnSlpCall *slpcall,
 
 		purple_debug_info("msn", "got_invite: transreqbody received\n");
 
-		g_return_if_fail(slpcall->xfer != NULL);
-
 		/* Don't do anything if we already have a direct connection */
 		if (slpcall->slplink->dc != NULL)
 			return;
@@ -694,8 +683,6 @@ got_invite(MsnSlpCall *slpcall,
 	else if (!strcmp(type, "application/x-msnmsgr-transrespbody"))
 	{
 		/* A direct connection negotiation response */
-		g_return_if_fail(slpcall->xfer != NULL);
-
 		msn_slp_process_transresp(slpcall, content);
 	}
 }
@@ -714,8 +701,6 @@ got_ok(MsnSlpCall *slpcall,
 		MsnSlpMessage *msg;
 		MsnDirectConn *dc;
 
-		g_return_if_fail(slpcall->xfer != NULL);
-
 		if (slpcall->slplink->dc != NULL) {
 			/*
 			 * If we already have an established direct connection
@@ -791,13 +776,6 @@ got_ok(MsnSlpCall *slpcall,
 		g_free(content);
 
 		msn_slplink_queue_slpmsg(slpcall->slplink, msg);
-
-		/*
-		 * Removed because it messes up direct connection by
-		 * starting p2p transfer
-		 */
-
-		/* msn_slpcall_session_init(slpcall); */
 	}
 	else if (!strcmp(type, "application/x-msnmsgr-transreqbody"))
 	{