Changeset 019c031 for protocols/proxy.c


Ignore:
Timestamp:
2005-12-04T21:55:15Z (16 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:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/proxy.c

    r500a1b6 r019c031  
    114114}
    115115
    116 static void no_one_calls(gpointer data, gint source, GaimInputCondition cond)
     116static void gaim_io_connected(gpointer data, gint source, GaimInputCondition cond)
    117117{
    118118        struct PHB *phb = data;
     
    163163        if (connect(fd, (struct sockaddr *)sin, sizeof(*sin)) < 0) {
    164164                if (sockerr_again()) {
    165                         phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, no_one_calls, phb);
     165                        phb->inpa = gaim_input_add(fd, GAIM_INPUT_WRITE, gaim_io_connected, phb);
    166166                        phb->fd = fd;
    167167                } else {
Note: See TracChangeset for help on using the changeset viewer.