# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1190993830 0
# Node ID 63b1ce39965caaa70adc56fb7377b053fbd54056
# Parent  48770cf120f19cd1423b6a67cc0f5c5387dd24c9
applied changes from 7f71045586c32cffc40f836f3fba92c693adda57
             through 24d76e86b06c5b1ab5f0a3ea37bd69ced034e0d0

diff -r 48770cf120f1 -r 63b1ce39965c libpurple/protocols/yahoo/yahoo_filexfer.c
--- a/libpurple/protocols/yahoo/yahoo_filexfer.c	Fri Sep 28 15:36:48 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo_filexfer.c	Fri Sep 28 15:37:10 2007 +0000
@@ -281,13 +281,9 @@
 			}
 		}
 	} else {
-		/* TODO: Using xfer->fd like this is probably a bad thing... */
+		xfer->fd = -1;
 		if (purple_proxy_connect(NULL, account, xfer_data->host, xfer_data->port,
-		                              yahoo_receivefile_connected, xfer) == NULL)
-			xfer->fd = -1;
-		else
-			xfer->fd = 0;
-		if (xfer->fd == -1) {
+		                              yahoo_receivefile_connected, xfer) == NULL) {
 			purple_notify_error(gc, NULL, _("File Transfer Failed"),
 			             _("Unable to establish file descriptor."));
 			purple_xfer_cancel_remote(xfer);
diff -r 48770cf120f1 -r 63b1ce39965c libpurple/upnp.c
--- a/libpurple/upnp.c	Fri Sep 28 15:36:48 2007 +0000
+++ b/libpurple/upnp.c	Fri Sep 28 15:37:10 2007 +0000
@@ -552,7 +552,7 @@
 	dd->inpa = 0;
 
 	close(dd->fd);
-	dd->fd = 0;
+	dd->fd = -1;
 
 	/* parse the response, and see if it was a success */
 	purple_upnp_parse_discover_response(buf, len, dd);