Mercurial > pidgin
changeset 23724:55f3660f60d2
merge of '181e1f6b21a5dc3c848f82475078ab94654fbb10'
and '9a83376a07e8bc9a2793a3006501b9419248ef77'
| author | Ka-Hing Cheung <khc@hxbc.us> |
|---|---|
| date | Thu, 14 Aug 2008 05:26:52 +0000 |
| parents | a556012a56b9 (diff) 0bdff80233fb (current diff) |
| children | 0248559762b6 |
| files | |
| diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/slplink.c Thu Aug 14 04:32:39 2008 +0000 +++ b/libpurple/protocols/msn/slplink.c Thu Aug 14 05:26:52 2008 +0000 @@ -27,6 +27,8 @@ #include "switchboard.h" #include "slp.h" +#define MSN_DEBUG_SLPLINK + void msn_slplink_send_msgpart(MsnSlpLink *slplink, MsnSlpMessage *slpmsg); #ifdef MSN_DEBUG_SLP_FILES
--- a/libpurple/protocols/msn/switchboard.c Thu Aug 14 04:32:39 2008 +0000 +++ b/libpurple/protocols/msn/switchboard.c Thu Aug 14 05:26:52 2008 +0000 @@ -34,6 +34,8 @@ static void msg_error_helper(MsnCmdProc *cmdproc, MsnMessage *msg, MsnMsgErrorType error); +#define MSN_DEBUG_SB + /************************************************************************** * Main **************************************************************************/ @@ -114,6 +116,11 @@ session = swboard->session; session->switches = g_list_remove(session->switches, swboard); + for (l = session->slplinks; l; l = l->next) { + MsnSlpLink *slplink = l->data; + if (slplink->swboard == swboard) slplink->swboard = NULL; + } + #if 0 /* This should never happen or we are in trouble. */ if (swboard->servconn != NULL) @@ -540,7 +547,7 @@ payload = msn_message_gen_payload(msg, &payload_len); #ifdef MSN_DEBUG_SB - purple_debug_info("msn", "SB length:{%d}", payload_len); + purple_debug_info("msn", "SB length:{%" G_GSIZE_FORMAT "}", payload_len); msn_message_show_readable(msg, "SB SEND", FALSE); #endif