Changeset 2945c6f for lib/http_client.c

Timestamp:

2010-07-24T21:16:18Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

f1f7b5e

Parents:

ef14a83 (diff), 593971d (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 ui-fix (which includes killerbee (i.e. file transfers and libpurple
support)). ui-fix rewrites the complete IRC core, fixing many things that
were broken/hacky/limited so far.

The list is too long to include here, but ​http://wiki.bitlbee.org/UiFix
has a summary, as does doc/CHANGES and of course the full revision history.

File:

• lib/http_client.c (modified) (2 diffs)

lib/http_client.c

@@ -151 +151 @@
         if( req->bytes_written < req->request_length )
                 req->inpa = b_input_add( source,
-                                         req->ssl ? ssl_getdirection( req->ssl ) : GAIM_INPUT_WRITE,
+                                         req->ssl ? ssl_getdirection( req->ssl ) : B_EV_IO_WRITE,
                                          http_connected, req );
         else
-                req->inpa = b_input_add( source, GAIM_INPUT_READ, http_incoming_data, req );
+                req->inpa = b_input_add( source, B_EV_IO_READ, http_incoming_data, req );
         
         return FALSE;
@@ -236 +236 @@
         /* There will be more! */
         req->inpa = b_input_add( req->fd,
-                                 req->ssl ? ssl_getdirection( req->ssl ) : GAIM_INPUT_READ,
+                                 req->ssl ? ssl_getdirection( req->ssl ) : B_EV_IO_READ,
                                  http_incoming_data, req );