Mercurial > pidgin
diff src/protocols/oscar/aim.h @ 13071:e84e4e56f8f6
[gaim-migrate @ 15433]
Some oscar changes from Jonathan Clark that
"1) Resolves a looping issue when interacting with the joscar library
(now in use on Adium)
2) Adds an account option for turning on/off proxied file transfers.
I'm hoping to come up with a good way of eliminating this option
all together soon."
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 30 Jan 2006 05:33:48 +0000 |
| parents | e739ace2688b |
| children | a0a4b44239e8 |
line wrap: on
line diff
--- a/src/protocols/oscar/aim.h Mon Jan 30 05:10:32 2006 +0000 +++ b/src/protocols/oscar/aim.h Mon Jan 30 05:33:48 2006 +0000 @@ -990,6 +990,7 @@ int method; /* What method is being used to transfer this file? DIRECT, REDIR, or PROXY */ int stage; /* At what stage was a proxy requested? NONE, STG1, STG2*/ int xfer_reffed; /* There are many timers, but we should only ref the xfer once */ + int redir_attempted; /* Have we previously attempted to redirect the connection? */ fu32_t res_bytes; /* The bytes already received for resuming a transfer */ aim_conn_t *conn;