Mercurial > pidgin.yaz
diff libpurple/protocols/msn/slplink.c @ 20516:5bc492d82ff4
explicit merge of '46d8a45835e685c9dd812f5c6c0df074388bec8a'
and 'fa439470adac87fe2027a307e96c857766b06d12'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 16 Sep 2007 18:05:55 +0000 |
parents | 723b5a2f91ce |
children | 4cd97da26150 |
line wrap: on
line diff
--- a/libpurple/protocols/msn/slplink.c Mon Sep 10 23:13:42 2007 +0000 +++ b/libpurple/protocols/msn/slplink.c Sun Sep 16 18:05:55 2007 +0000 @@ -112,8 +112,10 @@ if (slplink->remote_user != NULL) g_free(slplink->remote_user); +#if 0 if (slplink->directconn != NULL) msn_directconn_destroy(slplink->directconn); +#endif while (slplink->slp_calls != NULL) msn_slp_call_destroy(slplink->slp_calls->data); @@ -244,11 +246,13 @@ void msn_slplink_send_msg(MsnSlpLink *slplink, MsnMessage *msg) { +#if 0 if (slplink->directconn != NULL) { msn_directconn_send_msg(slplink->directconn, msg); } else +#endif { if (slplink->swboard == NULL) { @@ -634,9 +638,10 @@ MsnDirectConn *directconn; directconn = slplink->directconn; - +#if 0 if (!directconn->acked) msn_directconn_send_handshake(directconn); +#endif } else if (slpmsg->flags == 0x0 || slpmsg->flags == 0x20 || slpmsg->flags == 0x1000030)