Changeset 767a148 for irc.c

Timestamp:

2010-03-21T16:06:31Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

1cc0df3, 85693e6

Parents:

545d7c0 (diff), a81d679 (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 file transfer support. Most important points from my review
are fixed now, time to let it settle in and get people to try it.

File:

• irc.c (modified) (2 diffs)

irc.c

@@ -29 +29 @@
 #include "crypting.h"
 #include "ipc.h"
+#include "dcc.h"
 
 static gboolean irc_userping( gpointer _irc, int fd, b_input_condition cond );
@@ -1107 +1108 @@
                         return( 1 );
                 }
+                else if( g_strncasecmp( s + 1, "DCC", 3 ) == 0 )
+                {
+                        if( u && u->ic && u->ic->acc->prpl->transfer_request )
+                        {
+                                file_transfer_t *ft = dcc_request( u->ic, s + 5 );
+                                if ( ft )
+                                        u->ic->acc->prpl->transfer_request( u->ic, ft, u->handle );
+                        }
+                        return( 1 );
+                }               
                 else
                 {
-                        irc_usermsg( irc, "Non-ACTION CTCP's aren't supported" );
+                        irc_usermsg( irc, "Supported CTCPs are ACTION, VERSION, PING, TYPING, DCC" );
                         return( 0 );
                 }