Changeset 39adf06

Timestamp:

Jul 23, 2011, 11:28:36 PM (14 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:

• aim.c (modified) (1 diff)

aim.c

@@ -1829 +1829 @@
       fd = event_source->fds->pdata[i];
       fd->fd = cur->fd;
-      fd->events |= G_IO_IN | G_IO_HUP | G_IO_ERR;
+      fd->events = G_IO_IN | G_IO_HUP | G_IO_ERR;
       if (cur->status & AIM_CONN_STATUS_INPROGRESS) {
-        /* Yes, we're checking writable sockets here. Without it, AIM
-           login is really slow. */
+        /* AIM login requires checking writable sockets. See aim_select. */
         fd->events |= G_IO_OUT;
       }