Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/msn/msn.h

    r81ee561 r85693e6  
    6969        int sb_failures;
    7070        time_t first_sb_failure;
     71        GSList *filetransfers;
    7172       
    7273        const struct msn_away_state *away_state;
     
    180181int msn_sb_write_msg( struct im_connection *ic, struct msn_message *m );
    181182
     183/* invitation.c */
     184void msn_ftp_transfer_request( struct im_connection *ic, file_transfer_t *ft, char *who );
     185
    182186#endif //_MSN_H
Note: See TracChangeset for help on using the changeset viewer.