Mercurial > pidgin
changeset 30034:09e15f831d7e
A direct connection shouldn't be FT-only.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Fri, 23 Apr 2010 20:45:05 +0000 |
| parents | a613180bfeab |
| children | e47a4a7940ea |
| files | libpurple/protocols/msn/slp.c |
| diffstat | 1 files changed, 0 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/slp.c Fri Apr 23 00:03:20 2010 +0000 +++ b/libpurple/protocols/msn/slp.c Fri Apr 23 20:45:05 2010 +0000 @@ -222,15 +222,6 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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")) {