Mercurial > pidgin
changeset 17115:ec6a029c865d
merge of '0397391b6a278804196e57830cc216b8e236442a'
and 'f858c38e5d9f9c2d048dbe13db10776cdf7fafc9'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Thu, 17 May 2007 14:38:35 +0000 |
| parents | 8ed7b2d32ad1 (diff) 3aee35e0ecd8 (current diff) |
| children | 17117b8cfbb7 c8ed8e351541 |
| files | |
| diffstat | 3 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/slp.c Thu May 17 13:45:18 2007 +0000 +++ b/libpurple/protocols/msn/slp.c Thu May 17 14:38:35 2007 +0000 @@ -363,6 +363,8 @@ purple_xfer_set_cancel_recv_fnc(xfer, msn_xfer_cancel); slpcall->xfer = xfer; + purple_xfer_ref(slpcall->xfer); + xfer->data = slpcall; purple_xfer_request(xfer);
--- a/libpurple/protocols/msn/slpcall.c Thu May 17 13:45:18 2007 +0000 +++ b/libpurple/protocols/msn/slpcall.c Thu May 17 14:38:35 2007 +0000 @@ -120,6 +120,9 @@ if (slpcall->end_cb != NULL) slpcall->end_cb(slpcall, session); + if (slpcall->xfer != NULL) + purple_xfer_unref(slpcall->xfer); + g_free(slpcall); }
--- a/libpurple/protocols/msn/slplink.c Thu May 17 13:45:18 2007 +0000 +++ b/libpurple/protocols/msn/slplink.c Thu May 17 14:38:35 2007 +0000 @@ -763,6 +763,7 @@ slpcall->progress_cb = msn_xfer_progress_cb; slpcall->cb = msn_xfer_completed_cb; slpcall->xfer = xfer; + purple_xfer_ref(slpcall->xfer); slpcall->pending = TRUE;