Changeset 4aa0f6b for protocols/msn

Timestamp:

2010-06-07T14:31:07Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

56699f0

Parents:

0d9d53e (diff), 1fdb0a4 (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 killerbee stuff, bringing all the bleeding-edge stuff together.

Location:

protocols/msn

Files:

• Makefile (modified) (2 diffs)
• invitation.c (modified) (6 diffs)
• ns.c (modified) (1 diff)
• sb.c (modified) (1 diff)

protocols/msn/Makefile

@@ -8 +8 @@
 
 -include ../../Makefile.settings
+ifdef SRCDIR
+SRCDIR := $(SRCDIR)protocols/msn/
+endif
 
 # [SH] Program variables
@@ -33 +36 @@
 $(objects): ../../Makefile.settings Makefile
 
-$(objects): %.o: %.c
+$(objects): %.o: $(SRCDIR)%.c
         @echo '*' Compiling $<
         @$(CC) -c $(CFLAGS) $< -o $@

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;

protocols/msn/ns.c

@@ -76 +76 @@
         if( msn_write( ic, s, strlen( s ) ) )
         {
-                ic->inpa = b_input_add( md->fd, GAIM_INPUT_READ, msn_ns_callback, ic );
+                ic->inpa = b_input_add( md->fd, B_EV_IO_READ, msn_ns_callback, ic );
                 imcb_log( ic, "Connected to server, waiting for reply" );
         }

protocols/msn/sb.c

@@ -327 +327 @@
         
         if( msn_sb_write( sb, buf, strlen( buf ) ) )
-                sb->inp = b_input_add( sb->fd, GAIM_INPUT_READ, msn_sb_callback, sb );
+                sb->inp = b_input_add( sb->fd, B_EV_IO_READ, msn_sb_callback, sb );
         else
                 debug( "Error %d while connecting to switchboard server", 2 );