Mercurial > pidgin3 / changeset

--- a/libpurple/protocols/yahoo/yahoo_filexfer.c	Wed Sep 19 21:40:02 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo_filexfer.c	Thu Sep 20 02:38:49 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);

--- a/libpurple/upnp.c	Wed Sep 19 21:40:02 2007 +0000
+++ b/libpurple/upnp.c	Thu Sep 20 02:38:49 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);