diff src/protocols/yahoo/yahoo_filexfer.c @ 14089:10e8eb6a4910

[gaim-migrate @ 16712] Pretty large commit here. Basically I got sick of having to verify that gc is still valid on all the callback functions for gaim_proxy_connect(). The fix for this for gaim_proxy_connect() to return something that allows the connection attempt to be canceled. It's not quite there yet, but this is a good first step. I changed gaim_proxy_connect() to return a reference to a new GaimProxyConnectInfo (this used to be called PHB). Eventually this can be passed to a function that'll cancel the connection attempt. I also decided to add an error_cb instead of using connect_cb and passing a file descriptor of -1. And proxy.c will also pass an error message to callers which should explain the reason that the connection attempt failed. Oh, and proxy.c now never calls gaim_connection_error() committer: Tailor Script <[e-mail]>

--- a/src/protocols/yahoo/yahoo_filexfer.c	Sat Aug 12 10:06:15 2006 +0000
+++ b/src/protocols/yahoo/yahoo_filexfer.c	Sat Aug 12 10:12:43 2006 +0000
@@ -92,7 +92,7 @@
 
 }
 
-static void yahoo_receivefile_connected(gpointer data, gint source, GaimInputCondition condition)
+static void yahoo_receivefile_connected(gpointer data, gint source)
 {
 	GaimXfer *xfer;
 	struct yahoo_xfer_data *xd;
@@ -162,7 +162,7 @@
 	gaim_xfer_start(xfer, source, NULL, 0);
 }
 
-static void yahoo_sendfile_connected(gpointer data, gint source, GaimInputCondition condition)
+static void yahoo_sendfile_connected(gpointer data, gint source)
 {
 	GaimXfer *xfer;
 	struct yahoo_xfer_data *xd;
@@ -263,7 +263,7 @@
 		if (yd->jp) {
 			if (gaim_proxy_connect(account, gaim_account_get_string(account, "xferjp_host",  YAHOOJP_XFER_HOST),
 			                       gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
-			                       yahoo_sendfile_connected, xfer) == -1)
+			                       yahoo_sendfile_connected, NULL, xfer) == NULL)
 			{
 				gaim_notify_error(gc, NULL, _("File Transfer Failed"),
 				                _("Unable to establish file descriptor."));
@@ -272,7 +272,7 @@
 		} else {
 			if (gaim_proxy_connect(account, gaim_account_get_string(account, "xfer_host",  YAHOO_XFER_HOST),
 			                       gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
-			                       yahoo_sendfile_connected, xfer) == -1)
+			                       yahoo_sendfile_connected, NULL, xfer) == NULL)
 			{
 				gaim_notify_error(gc, NULL, _("File Transfer Failed"),
 				                _("Unable to establish file descriptor."));
@@ -280,8 +280,12 @@
 			}
 		}
 	} else {
-		xfer->fd = gaim_proxy_connect(account, xfer_data->host, xfer_data->port,
-		                              yahoo_receivefile_connected, xfer);
+		/* TODO: Using xfer->fd like this is probably a bad thing... */
+		if (gaim_proxy_connect(account, xfer_data->host, xfer_data->port,
+		                              yahoo_receivefile_connected, NULL, xfer) == NULL)
+			xfer->fd = -1;
+		else
+			xfer->fd = 0;
 		if (xfer->fd == -1) {
 			gaim_notify_error(gc, NULL, _("File Transfer Failed"),
 			             _("Unable to establish file descriptor."));