Mercurial > pidgin.yaz
changeset 32690:694111dd6896
Remove the special case of fd=0 in purple_xfer_start().
All the included protocol prpl's seem to do the right thing.
| author | andrew.victor@mxit.com |
|---|---|
| date | Sun, 25 Sep 2011 19:28:12 +0000 |
| parents | 48bc3f9f2115 |
| children | 7fcf55606339 |
| files | libpurple/ft.c libpurple/ft.h |
| diffstat | 2 files changed, 2 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/ft.c Sun Sep 25 19:15:05 2011 +0000 +++ b/libpurple/ft.c Sun Sep 25 19:28:12 2011 +0000 @@ -1439,13 +1439,6 @@ purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_STARTED); - /* - * FIXME 3.0.0 -- there's too much broken code depending on fd == 0 - * meaning "don't use a real fd" - */ - if (fd == 0) - fd = -1; - if (type == PURPLE_XFER_RECEIVE) { cond = PURPLE_INPUT_READ;
--- a/libpurple/ft.h Sun Sep 25 19:15:05 2011 +0000 +++ b/libpurple/ft.h Sun Sep 25 19:28:12 2011 +0000 @@ -637,11 +637,8 @@ * file receive transfer. On send, @a fd must be specified, and * @a ip and @a port are ignored. * - * Prior to libpurple 2.6.0, passing '0' to @a fd was special-cased to - * allow the protocol plugin to facilitate the file transfer itself. As of - * 2.6.0, this is supported (for backward compatibility), but will be - * removed in libpurple 3.0.0. If a prpl detects that the running libpurple - * is running 2.6.0 or higher, it should use the invalid fd '-1'. + * Passing @a fd as '-1' is a special-case and indicates to the + * protocol plugin to facilitate the file transfer itself. * * @param xfer The file transfer. * @param fd The file descriptor for the socket.