Changeset b308cf9 for protocols/msn/invitation.c

Timestamp:

2010-06-05T23:21:02Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1fdb0a4

Parents:

3ab1d31 (diff), e774815 (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:

Merging libpurple branch into killerbee. It's fairly usable already, and
Debian packaging is now properly separated. This also picks up a load of
stuff from mainline it seems.

File:

• protocols/msn/invitation.c (modified) (6 diffs)

protocols/msn/invitation.c

@@ -209 +209 @@
         sock_make_nonblocking( fd );
 
-        msn_file->r_event_id = b_input_add( fd, GAIM_INPUT_READ, msn_ftp_read, file );
+        msn_file->r_event_id = b_input_add( fd, B_EV_IO_READ, msn_ftp_read, file );
 
         return FALSE;
@@ -230 +230 @@
         }
 
-        msn_file->r_event_id = b_input_add( msn_file->fd, GAIM_INPUT_READ, msn_ftps_connected, file );
+        msn_file->r_event_id = b_input_add( msn_file->fd, B_EV_IO_READ, msn_ftps_connected, file );
 
         g_snprintf( buf, sizeof( buf ),
@@ -318 +318 @@
         
         sock_make_nonblocking( msn_file->fd );
-        msn_file->r_event_id = b_input_add( msn_file->fd, GAIM_INPUT_READ, msn_ftp_read, file );
+        msn_file->r_event_id = b_input_add( msn_file->fd, B_EV_IO_READ, msn_ftp_read, file );
         
         return FALSE;
@@ -415 +415 @@
             ( msn_file->data_sent + msn_file->sbufpos - 3 < file->file_size ) ) {
                 if( !msn_file->w_event_id )
-                        msn_file->w_event_id = b_input_add( msn_file->fd, GAIM_INPUT_WRITE, msn_ftp_send, file );
+                        msn_file->w_event_id = b_input_add( msn_file->fd, B_EV_IO_WRITE, msn_ftp_send, file );
                 return TRUE;
         }
@@ -452 +452 @@
                 /* we might already be listening if this is data from an overflow */
                 if( !msn_file->w_event_id )
-                        msn_file->w_event_id = b_input_add( msn_file->fd, GAIM_INPUT_WRITE, msn_ftp_send, file );
+                        msn_file->w_event_id = b_input_add( msn_file->fd, B_EV_IO_WRITE, msn_ftp_send, file );
         }
 
@@ -617 +617 @@
 
         msn_file->r_event_id = 
-                b_input_add( msn_file->fd, GAIM_INPUT_READ, msn_ftp_read, file );
+                b_input_add( msn_file->fd, B_EV_IO_READ, msn_ftp_read, file );
 
         return TRUE;