Mercurial > pidgin.yaz

comparison libpurple/protocols/msn/slplink.c @ 20516:5bc492d82ff4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
19719:bfa1557a7773 20516:5bc492d82ff4
110 g_free(slplink->local_user); 110 g_free(slplink->local_user);
111 111
112 if (slplink->remote_user != NULL) 112 if (slplink->remote_user != NULL)
113 g_free(slplink->remote_user); 113 g_free(slplink->remote_user);
114 114
115 #if 0
115 if (slplink->directconn != NULL) 116 if (slplink->directconn != NULL)
116 msn_directconn_destroy(slplink->directconn); 117 msn_directconn_destroy(slplink->directconn);
118 #endif
117 119
118 while (slplink->slp_calls != NULL) 120 while (slplink->slp_calls != NULL)
119 msn_slp_call_destroy(slplink->slp_calls->data); 121 msn_slp_call_destroy(slplink->slp_calls->data);
120 122
121 session->slplinks = 123 session->slplinks =
242 } 244 }
243 245
244 void 246 void
245 msn_slplink_send_msg(MsnSlpLink *slplink, MsnMessage *msg) 247 msn_slplink_send_msg(MsnSlpLink *slplink, MsnMessage *msg)
246 { 248 {
249 #if 0
247 if (slplink->directconn != NULL) 250 if (slplink->directconn != NULL)
248 { 251 {
249 msn_directconn_send_msg(slplink->directconn, msg); 252 msn_directconn_send_msg(slplink->directconn, msg);
250 } 253 }
251 else 254 else
255 #endif
252 { 256 {
253 if (slplink->swboard == NULL) 257 if (slplink->swboard == NULL)
254 { 258 {
255 slplink->swboard = msn_session_get_swboard(slplink->session, 259 slplink->swboard = msn_session_get_swboard(slplink->session,
256 slplink->remote_user, MSN_SB_FLAG_FT); 260 slplink->remote_user, MSN_SB_FLAG_FT);
632 if (slpmsg->flags == 0x100) 636 if (slpmsg->flags == 0x100)
633 { 637 {
634 MsnDirectConn *directconn; 638 MsnDirectConn *directconn;
635 639
636 directconn = slplink->directconn; 640 directconn = slplink->directconn;
637 641 #if 0
638 if (!directconn->acked) 642 if (!directconn->acked)
639 msn_directconn_send_handshake(directconn); 643 msn_directconn_send_handshake(directconn);
644 #endif
640 } 645 }
641 else if (slpmsg->flags == 0x0 || slpmsg->flags == 0x20 || 646 else if (slpmsg->flags == 0x0 || slpmsg->flags == 0x20 ||
642 slpmsg->flags == 0x1000030) 647 slpmsg->flags == 0x1000030)
643 { 648 {
644 /* Release all the messages and send the ACK */ 649 /* Release all the messages and send the ACK */