diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-12-04 22:55:15 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2005-12-04 22:55:15 +0100 |
| commit | 019c031a8d77fa8f21792ccf0e07c2dfa058ce5f (patch) | |
| tree | 116b7dc98dc8b4d4805a02f7e5d4ce64c95b9eac /protocols/proxy.c | |
| parent | 500a1b60d3dd0565d215721e0db7ec7da2dec2e0 (diff) | |
| parent | d636233a518fbe46264230866d4b8ea463f1474e (diff) | |
Merge from Wilmer
Diffstat (limited to 'protocols/proxy.c')
| -rw-r--r-- | protocols/proxy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/protocols/proxy.c b/protocols/proxy.c index 6d450c92..47ece91e 100644 --- a/protocols/proxy.c +++ b/protocols/proxy.c @@ -113,7 +113,7 @@ static gboolean gaim_io_invoke(GIOChannel *source, GIOCondition condition, gpoin return TRUE; } -static void no_one_calls(gpointer data, gint source, GaimInputCondition cond) +static void gaim_io_connected(gpointer data, gint source, GaimInputCondition cond) { struct PHB *phb = data; unsigned int len; @@ -162,7 +162,7 @@ static int proxy_connect_none(char *host, unsigned short port, struct PHB *phb) if (connect(fd, (struct sockaddr *)sin, sizeof(*sin)) < 0) { if (sockerr_again()) { - phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, no_one_calls, phb); + phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, gaim_io_connected, phb); phb->fd = fd; } else { closesocket(fd); |