Mercurial > pidgin
diff src/protocols/msn/slp.c @ 10296:a7b2fd5efcf2
[gaim-migrate @ 11476]
Some "random updates" updates from patch 1077274 by Felipe Contreras:
"Some changes in the behaviour of slpcalls (for FT),
free some unused structures and properly close
switchboard connections."
Looks good to me, and seems to have fixed a mysterious FT problem that I had
been pretending didn't exist.
committer: Tailor Script <tailor@pidgin.im>
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Thu, 02 Dec 2004 16:07:26 +0000 |
| parents | 62ab1a4c3a2a |
| children | 2e01c503aa4f |
line wrap: on
line diff
--- a/src/protocols/msn/slp.c Thu Dec 02 13:03:23 2004 +0000 +++ b/src/protocols/msn/slp.c Thu Dec 02 16:07:26 2004 +0000 @@ -331,6 +331,8 @@ slpcall->progress_cb = msn_xfer_progress_cb; slpcall->branch = g_strdup(branch); + slpcall->pending = TRUE; + xfer = gaim_xfer_new(account, GAIM_XFER_RECEIVE, slpcall->slplink->remote_user); @@ -935,6 +937,10 @@ userlist = slpcall->slplink->session->userlist; + /* If the session is being destroyed we better stop doing anything. */ + if (slpcall->slplink->session->destroying) + return; + /* Free one window slot */ userlist->buddy_icon_window++;
