Changeset 85693e6 for protocols/msn/msn.c

Timestamp:

2010-03-21T16:17:24Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0cb71a6

Parents:

81ee561 (diff), 767a148 (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 in killerbee stuff (just file transfers and maybe a few things from
mainline). Once I add ft support glue to protocols/purple/ I guess this will
all go into killerbee.

File:

• protocols/msn/msn.c (modified) (2 diffs)

protocols/msn/msn.c

@@ -81 +81 @@
         if( md )
         {
+                while( md->filetransfers ) {
+                        imcb_file_canceled( md->filetransfers->data, "Closing connection" );
+                }
+                
                 if( md->fd >= 0 )
                         closesocket( md->fd );
@@ -340 +344 @@
         ret->send_typing = msn_send_typing;
         ret->handle_cmp = g_strcasecmp;
+        ret->transfer_request = msn_ftp_transfer_request;
 
         register_protocol(ret);