Mercurial > pidgin
changeset 14115:8ea1929c4c69
[gaim-migrate @ 16749]
Fix a bunch of warnings that I caused.
Sorry, I should have compiled before committing.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 14 Aug 2006 07:27:41 +0000 |
| parents | 7795753a7af6 |
| children | 12be86c7e2ce |
| files | src/protocols/qq/qq_proxy.c src/protocols/qq/qq_proxy.h src/protocols/qq/udp_proxy_s5.c |
| diffstat | 3 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/qq/qq_proxy.c Mon Aug 14 07:23:11 2006 +0000 +++ b/src/protocols/qq/qq_proxy.c Mon Aug 14 07:27:41 2006 +0000 @@ -246,7 +246,7 @@ } else { /* connect returns 0 */ gaim_debug(GAIM_DEBUG_INFO, "QQ", "Connected.\n"); fcntl(fd, F_SETFL, 0); - phb->func(phb->data, fd, GAIM_INPUT_READ); + phb->func(phb->data, fd, NULL); } return fd; @@ -255,7 +255,7 @@ /* returns the socket handler, or -1 if there is any error */ static gint _qq_udp_proxy_connect(GaimAccount *account, const gchar *server, - guint16 port, void callback(gpointer, gint, GaimInputCondition), GaimConnection *gc) + guint16 port, void callback(gpointer, gint, const gchar *error_message), GaimConnection *gc) { struct sockaddr_in sin; struct PHB *phb;
--- a/src/protocols/qq/qq_proxy.h Mon Aug 14 07:23:11 2006 +0000 +++ b/src/protocols/qq/qq_proxy.h Mon Aug 14 07:27:41 2006 +0000 @@ -31,7 +31,7 @@ #define QQ_CONNECT_STEPS 2 /* steps in connection */ struct PHB { - GaimInputFunction func; + GaimProxyConnectFunction func; gpointer data; gchar *host; gint port;
--- a/src/protocols/qq/udp_proxy_s5.c Mon Aug 14 07:23:11 2006 +0000 +++ b/src/protocols/qq/udp_proxy_s5.c Mon Aug 14 07:27:41 2006 +0000 @@ -45,7 +45,7 @@ if (phb->account == NULL || gaim_account_get_connection(phb->account) != NULL) { - phb->func(phb->data, source, GAIM_INPUT_READ); + phb->func(phb->data, source, NULL); } g_free(phb->host); @@ -61,7 +61,7 @@ if (phb->account == NULL || gaim_account_get_connection(phb->account) != NULL) { - phb->func(phb->data, -1, GAIM_INPUT_READ); + phb->func(phb->data, -1, NULL); } g_free(phb->host); @@ -93,7 +93,7 @@ fcntl(phb->udpsock, F_SETFL, 0); if (phb->account == NULL || gaim_account_get_connection(phb->account) != NULL) { - phb->func(phb->data, phb->udpsock, GAIM_INPUT_READ); + phb->func(phb->data, phb->udpsock, NULL); } g_free(phb->host); @@ -158,7 +158,7 @@ gaim_debug(GAIM_DEBUG_INFO, "s5_sendconnect", "packet too small\n"); if (phb->account == NULL || gaim_account_get_connection(phb->account) != NULL) { - phb->func(phb->data, -1, GAIM_INPUT_READ); + phb->func(phb->data, -1, NULL); } g_free(phb->host); @@ -182,7 +182,7 @@ if (phb->account == NULL || gaim_account_get_connection(phb->account) != NULL) { - phb->func(phb->data, -1, GAIM_INPUT_READ); + phb->func(phb->data, -1, NULL); } g_free(phb->host); @@ -195,7 +195,7 @@ if (phb->account == NULL || gaim_account_get_connection(phb->account) != NULL) { - phb->func(phb->data, -1, GAIM_INPUT_READ); + phb->func(phb->data, -1, NULL); } g_free(phb->host); @@ -224,7 +224,7 @@ if (phb->account == NULL || gaim_account_get_connection(phb->account) != NULL) { - phb->func(phb->data, source, GAIM_INPUT_READ); + phb->func(phb->data, source, NULL); } g_free(phb->host); @@ -238,7 +238,7 @@ if (phb->account == NULL || gaim_account_get_connection(phb->account) != NULL) { - phb->func(phb->data, -1, GAIM_INPUT_READ); + phb->func(phb->data, -1, NULL); } g_free(phb->host); @@ -263,7 +263,7 @@ if (phb->account == NULL || gaim_account_get_connection(phb->account) != NULL) { - phb->func(phb->data, -1, GAIM_INPUT_READ); + phb->func(phb->data, -1, NULL); } g_free(phb->host); @@ -297,7 +297,7 @@ close(source); if (phb->account == NULL || gaim_account_get_connection(phb->account) != NULL) { - phb->func(phb->data, -1, GAIM_INPUT_READ); + phb->func(phb->data, -1, NULL); } g_free(phb->host); @@ -327,7 +327,7 @@ if (phb->account == NULL || gaim_account_get_connection(phb->account) != NULL) { - phb->func(phb->data, -1, GAIM_INPUT_READ); + phb->func(phb->data, -1, NULL); } g_free(phb->host);