Changeset d25ebea

Timestamp:

2010-05-25T22:04:55Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

51a799e

Parents:

f85e9d6

Message:

GAIM_INPUT_* were renamed, at last.

Location:

protocols

Files:

• jabber/s5bytestream.c (modified) (7 diffs)
• msn/invitation.c (modified) (6 diffs)

protocols/jabber/s5bytestream.c

@@ -406 +406 @@
                         bt->phase = BS_PHASE_CONNECTED;
                         
-                        bt->tf->watch_out = b_input_add( fd, GAIM_INPUT_WRITE, jabber_bs_recv_handshake, bt );
+                        bt->tf->watch_out = b_input_add( fd, B_EV_IO_WRITE, jabber_bs_recv_handshake, bt );
 
                         /* since it takes forever(3mins?) till connect() fails on itself we schedule a timeout */
@@ -433 +433 @@
                         bt->phase = BS_PHASE_REQUEST;
 
-                        bt->tf->watch_in = b_input_add( fd, GAIM_INPUT_READ, jabber_bs_recv_handshake, bt );
+                        bt->tf->watch_in = b_input_add( fd, B_EV_IO_READ, jabber_bs_recv_handshake, bt );
 
                         bt->tf->watch_out = 0;
@@ -589 +589 @@
 
         tf->ft->data = tf;
-        tf->watch_in = b_input_add( tf->fd, GAIM_INPUT_READ, jabber_bs_recv_read, bt );
+        tf->watch_in = b_input_add( tf->fd, B_EV_IO_READ, jabber_bs_recv_read, bt );
         tf->ft->write_request = jabber_bs_recv_write_request;
 
@@ -631 +631 @@
                 if( ( ret == -1 ) && ( errno == EAGAIN ) )
                 {
-                        tf->watch_in = b_input_add( tf->fd, GAIM_INPUT_READ, jabber_bs_recv_read, bt );
+                        tf->watch_in = b_input_add( tf->fd, B_EV_IO_READ, jabber_bs_recv_read, bt );
                         return FALSE;
                 }
@@ -707 +707 @@
                 imcb_file_finished( ft );
         else
-                bt->tf->watch_out = b_input_add( tf->fd, GAIM_INPUT_WRITE, jabber_bs_send_can_write, bt );
+                bt->tf->watch_out = b_input_add( tf->fd, B_EV_IO_WRITE, jabber_bs_send_can_write, bt );
                 
         return TRUE;
@@ -918 +918 @@
                                 bt->streamhosts = g_slist_append( bt->streamhosts, sh );
 
-                                bt->tf->watch_in = b_input_add( tf->fd, GAIM_INPUT_READ, jabber_bs_send_handshake, bt );
+                                bt->tf->watch_in = b_input_add( tf->fd, B_EV_IO_READ, jabber_bs_send_handshake, bt );
                                 bt->connect_timeout = b_timeout_add( JABBER_BS_LISTEN_TIMEOUT * 1000, jabber_bs_connect_timeout, bt );
                         } else {
@@ -1055 +1055 @@
                         bt->phase = BS_PHASE_CONNECTED;
 
-                        bt->tf->watch_in = b_input_add( fd, GAIM_INPUT_READ, jabber_bs_send_handshake, bt );
+                        bt->tf->watch_in = b_input_add( fd, B_EV_IO_READ, jabber_bs_send_handshake, bt );
                         return FALSE;
                 }

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;