# HG changeset patch # User Mark Doliner # Date 1155544073 0 # Node ID d812efcea547ac204c0dc3631ef4cdd0156f05cc # Parent 54147aa1ffe69e1fe658d1e45d4ba07ecc9ace75 [gaim-migrate @ 16754] Warning fixes for now. Someone (probably me, sigh) will have to change this to use gaim_proxy_connect_cancel() later in the week committer: Tailor Script diff -r 54147aa1ffe6 -r d812efcea547 src/protocols/yahoo/yahoo.c --- a/src/protocols/yahoo/yahoo.c Mon Aug 14 08:24:30 2006 +0000 +++ b/src/protocols/yahoo/yahoo.c Mon Aug 14 08:27:53 2006 +0000 @@ -2239,7 +2239,7 @@ } } -static void yahoo_got_connected(gpointer data, gint source) +static void yahoo_got_connected(gpointer data, gint source, const gchar *error_message) { GaimConnection *gc = data; struct yahoo_data *yd; @@ -2266,7 +2266,7 @@ gc->inpa = gaim_input_add(yd->fd, GAIM_INPUT_READ, yahoo_pending, gc); } -static void yahoo_got_web_connected(gpointer data, gint source) +static void yahoo_got_web_connected(gpointer data, gint source, const gchar *error_message) { GaimConnection *gc = data; struct yahoo_data *yd; @@ -2390,7 +2390,7 @@ gc->inpa = gaim_input_add(source, GAIM_INPUT_READ, yahoo_web_pending, gc); } -static void yahoo_got_cookies(gpointer data, gint source) +static void yahoo_got_cookies(gpointer data, gint source, const gchar *error_message) { GaimConnection *gc = data; diff -r 54147aa1ffe6 -r d812efcea547 src/protocols/yahoo/yahoo_filexfer.c --- a/src/protocols/yahoo/yahoo_filexfer.c Mon Aug 14 08:24:30 2006 +0000 +++ b/src/protocols/yahoo/yahoo_filexfer.c Mon Aug 14 08:27:53 2006 +0000 @@ -92,7 +92,7 @@ } -static void yahoo_receivefile_connected(gpointer data, gint source) +static void yahoo_receivefile_connected(gpointer data, gint source, const gchar *error_message) { 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) +static void yahoo_sendfile_connected(gpointer data, gint source, const gchar *error_message) { GaimXfer *xfer; struct yahoo_xfer_data *xd; diff -r 54147aa1ffe6 -r d812efcea547 src/protocols/yahoo/yahoo_picture.c --- a/src/protocols/yahoo/yahoo_picture.c Mon Aug 14 08:24:30 2006 +0000 +++ b/src/protocols/yahoo/yahoo_picture.c Mon Aug 14 08:27:53 2006 +0000 @@ -406,7 +406,7 @@ } } -static void yahoo_buddy_icon_upload_connected(gpointer data, gint source) +static void yahoo_buddy_icon_upload_connected(gpointer data, gint source, const gchar *error_message) { struct yahoo_buddy_icon_upload_data *d = data; struct yahoo_packet *pkt; diff -r 54147aa1ffe6 -r d812efcea547 src/protocols/yahoo/yahoochat.c --- a/src/protocols/yahoo/yahoochat.c Mon Aug 14 08:24:30 2006 +0000 +++ b/src/protocols/yahoo/yahoochat.c Mon Aug 14 08:27:53 2006 +0000 @@ -1373,7 +1373,7 @@ } -static void yahoo_roomlist_got_connected(gpointer data, gint source) +static void yahoo_roomlist_got_connected(gpointer data, gint source, const gchar *error_message) { struct yahoo_roomlist *yrl = data; GaimRoomlist *list = yrl->list; diff -r 54147aa1ffe6 -r d812efcea547 src/protocols/yahoo/ycht.c --- a/src/protocols/yahoo/ycht.c Mon Aug 14 08:24:30 2006 +0000 +++ b/src/protocols/yahoo/ycht.c Mon Aug 14 08:27:53 2006 +0000 @@ -528,7 +528,7 @@ } } -static void ycht_got_connected(gpointer data, gint source) +static void ycht_got_connected(gpointer data, gint source, const gchar *error_message) { YchtConn *ycht = data; GaimConnection *gc = ycht->gc;