Changeset 85693e6 for irc.c


Ignore:
Timestamp:
2010-03-21T16:17:24Z (10 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
  • irc.c

    r81ee561 r85693e6  
    2929#include "crypting.h"
    3030#include "ipc.h"
     31#include "dcc.h"
    3132
    3233static gboolean irc_userping( gpointer _irc, int fd, b_input_condition cond );
     
    11091110                        return( 1 );
    11101111                }
     1112                else if( g_strncasecmp( s + 1, "DCC", 3 ) == 0 )
     1113                {
     1114                        if( u && u->ic && u->ic->acc->prpl->transfer_request )
     1115                        {
     1116                                file_transfer_t *ft = dcc_request( u->ic, s + 5 );
     1117                                if ( ft )
     1118                                        u->ic->acc->prpl->transfer_request( u->ic, ft, u->handle );
     1119                        }
     1120                        return( 1 );
     1121                }               
    11111122                else
    11121123                {
    1113                         irc_usermsg( irc, "Non-ACTION CTCP's aren't supported" );
     1124                        irc_usermsg( irc, "Supported CTCPs are ACTION, VERSION, PING, TYPING, DCC" );
    11141125                        return( 0 );
    11151126                }
Note: See TracChangeset for help on using the changeset viewer.