Changeset 019c031 for protocols/proxy.c

Timestamp:

2005-12-04T21:55:15Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

568aaf7

Parents:

500a1b6 (diff), d636233 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from Wilmer

File:

• protocols/proxy.c (modified) (2 diffs)

protocols/proxy.c

@@ -114 +114 @@
 }
 
-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;
@@ -163 +163 @@
         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 {