Changeset 17a6ee9 for protocols/msn

Timestamp:

2010-04-11T14:37:06Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a87e6ba

Parents:

1f92a58

Message:

Including DCC stuff again, with a wonderful extra layer of abstraction.
Some hooks are missing so sending files doesn't work yet. Receiving also
still seems to have some issues. On the plus side, at least the MSN/Jabber
modules work again.

Location:

protocols/msn

Files:

• Makefile (modified) (1 diff)
• msn.c (modified) (2 diffs)
• msn_util.c (modified) (1 diff)
• sb.c (modified) (2 diffs)

protocols/msn/Makefile

@@ -10 +10 @@
 
 # [SH] Program variables
-objects = invitation.o msn.o msn_util.o ns.o passport.o sb.o tables.o
+objects = msn.o msn_util.o ns.o passport.o sb.o tables.o
 
 CFLAGS += -Wall

protocols/msn/msn.c

@@ -81 +81 @@
         if( md )
         {
+                /** Disabling MSN ft support for now.
                 while( md->filetransfers ) {
                         imcb_file_canceled( md->filetransfers->data, "Closing connection" );
                 }
+                */
                 
                 if( md->fd >= 0 )
@@ -344 +346 @@
         ret->send_typing = msn_send_typing;
         ret->handle_cmp = g_strcasecmp;
-        ret->transfer_request = msn_ftp_transfer_request;
+        //ret->transfer_request = msn_ftp_transfer_request;
 
         register_protocol(ret);

protocols/msn/msn_util.c

@@ -96 +96 @@
         msn_buddy_list_add( bla->ic, "AL", bla->handle, bla->realname );
         
-        if( imcb_find_buddy( bla->ic, bla->handle ) == NULL )
-                imcb_ask_add( bla->ic, bla->handle, NULL );
+        imcb_ask_add( bla->ic, bla->handle, NULL );
         
         g_free( bla->handle );

protocols/msn/sb.c

@@ -691 +691 @@
                         }
                 }
+#if 0
+                // Disable MSN ft support for now.
                 else if( g_strncasecmp( ct, "text/x-msmsgsinvite", 19 ) == 0 )
                 {
@@ -723 +725 @@
                         g_free( command );
                 }
+#endif
                 else if( g_strncasecmp( ct, "application/x-msnmsgrp2p", 24 ) == 0 ) 
                 {