# HG changeset patch
# User andrew.victor@mxit.com
# Date 1316978892 0
# Node ID 694111dd689657116dfc6b1e186884492dce6ab7
# Parent  48bc3f9f2115275704567537dad6aab63b054dce
Remove the special case of fd=0 in purple_xfer_start().
All the included protocol prpl's seem to do the right thing.

diff -r 48bc3f9f2115 -r 694111dd6896 libpurple/ft.c
--- 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;
 
diff -r 48bc3f9f2115 -r 694111dd6896 libpurple/ft.h
--- 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.