# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1190256102 0
# Node ID dc08f2fa9a666b43c0d2c0a8ce72ffb67c9f17fc
# Parent  f34ffa69fdce54b8326596d6cc367c52be3dd1c3# Parent  be996322b2c34bc3c618b78ebb2a32838cb27fb6
merge of '24d76e86b06c5b1ab5f0a3ea37bd69ced034e0d0'
     and '9c6a035630926fd407c6bee96f297147920c7365'

diff -r be996322b2c3 -r dc08f2fa9a66 libpurple/protocols/yahoo/yahoo_filexfer.c
--- a/libpurple/protocols/yahoo/yahoo_filexfer.c	Wed Sep 19 22:21:22 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo_filexfer.c	Thu Sep 20 02:41:42 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 be996322b2c3 -r dc08f2fa9a66 libpurple/upnp.c
--- a/libpurple/upnp.c	Wed Sep 19 22:21:22 2007 +0000
+++ b/libpurple/upnp.c	Thu Sep 20 02:41:42 2007 +0000
@@ -553,7 +553,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);