Mercurial > pidgin
diff src/protocols/msn/slpcall.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 | ecf3ce2e2ab1 |
| children | 2e01c503aa4f |
line wrap: on
line diff
--- a/src/protocols/msn/slpcall.c Thu Dec 02 13:03:23 2004 +0000 +++ b/src/protocols/msn/slpcall.c Thu Dec 02 16:07:26 2004 +0000 @@ -189,11 +189,21 @@ gboolean msn_slp_call_timeout(gpointer data) { + MsnSlpCall *slpcall; + gaim_debug_info("msn", "slpcall timeout\n"); - msn_slp_call_destroy(data); + slpcall = data; - return FALSE; + if (!slpcall->pending && !slpcall->progress) + { + msn_slp_call_destroy(slpcall); + return FALSE; + } + + slpcall->progress = FALSE; + + return TRUE; } MsnSlpCall * @@ -241,14 +251,5 @@ } #endif - if (slpcall != NULL) - { - if (slpcall->timer) - gaim_timeout_remove(slpcall->timer); - - slpcall->timer = gaim_timeout_add(MSN_SLPCALL_TIMEOUT, - msn_slp_call_timeout, slpcall); - } - return slpcall; }