Changeset 0fb32dd for protocols/msn/msn.c

Timestamp:

2015-04-06T17:07:03Z (9 years ago)

Author:

dequis <dx@…>

Children:

1aacef41

Parents:

b3ebb3a (diff), a9b1e0e (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:

Merge branch 'develop' into feat/hip-cat

Conflicts:

irc.h
irc_channel.c

File:

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

protocols/msn/msn.c

@@ -96 +96 @@
 
         if (md) {
-                /** Disabling MSN ft support for now.
-                while( md->filetransfers ) {
-                        imcb_file_canceled( md->filetransfers->data, "Closing connection" );
-                }
-                */
-
                 msn_ns_close(md->ns);
 
@@ -470 +464 @@
         ret->buddy_action = msn_buddy_action;
 
-        //ret->transfer_request = msn_ftp_transfer_request;
-
         register_protocol(ret);
 }