Changeset 39adf06


Ignore:
Timestamp:
Jul 23, 2011, 11:28:36 PM (13 years ago)
Author:
GitHub Merge Button <merge-button@github.com>
Parents:
cbc8657 (diff), 3234121 (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 323412185513364eaef94cf3f6cbb70957d93c5f into cbc86575b336c399f09c67886f79383681d3e36a
File:
1 edited

Legend:

Unmodified
Added
Removed
  • aim.c

    rff7449e r3234121  
    18291829      fd = event_source->fds->pdata[i];
    18301830      fd->fd = cur->fd;
    1831       fd->events |= G_IO_IN | G_IO_HUP | G_IO_ERR;
     1831      fd->events = G_IO_IN | G_IO_HUP | G_IO_ERR;
    18321832      if (cur->status & AIM_CONN_STATUS_INPROGRESS) {
    1833         /* Yes, we're checking writable sockets here. Without it, AIM
    1834            login is really slow. */
     1833        /* AIM login requires checking writable sockets. See aim_select. */
    18351834        fd->events |= G_IO_OUT;
    18361835      }
Note: See TracChangeset for help on using the changeset viewer.