# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1091953058 0
# Node ID b030f83693dadf9b74e4ad20723ff5c3ec1d3fd1
# Parent  2273790bb5188c428f5a5d78505f14152651a1a2
[gaim-migrate @ 10576]
Remotely canceled file transfers in MSN are now noticed, so that we
don't accidentally cancel the file transfer and crash Gaim. Patch by Felipe
Contreras.

committer: Tailor Script <tailor@pidgin.im>

diff -r 2273790bb518 -r b030f83693da ChangeLog
--- a/ChangeLog	Sun Aug 08 05:56:17 2004 +0000
+++ b/ChangeLog	Sun Aug 08 08:17:38 2004 +0000
@@ -9,6 +9,9 @@
 	  causes a crash
 	* Delayed messages and system messages no longer cause
 	  sound events to be triggered (Nathan Fredrickson)
+	* Remotely canceled file transfers in MSN are now noticed, so that we
+	  don't accidentally cancel the file transfer and crash Gaim
+	  (Felipe Contreras).
 
 version 0.81 (08/05/2004):
 	New Features:
diff -r 2273790bb518 -r b030f83693da src/protocols/msn/slp.h
--- a/src/protocols/msn/slp.h	Sun Aug 08 05:56:17 2004 +0000
+++ b/src/protocols/msn/slp.h	Sun Aug 08 08:17:38 2004 +0000
@@ -43,5 +43,6 @@
 						   const char *body, long long size);
 
 void msn_xfer_cancel(GaimXfer *xfer);
+void msn_xfer_end_cb(MsnSlpCall *slpcall);
 
 #endif /* _MSN_SLP_H_ */
diff -r 2273790bb518 -r b030f83693da src/protocols/msn/slplink.c
--- a/src/protocols/msn/slplink.c	Sun Aug 08 05:56:17 2004 +0000
+++ b/src/protocols/msn/slplink.c	Sun Aug 08 08:17:38 2004 +0000
@@ -631,6 +631,7 @@
 	msn_slp_call_init(slpcall, MSN_SLPCALL_DC);
 
 	slpcall->session_init_cb = send_file_cb;
+	slpcall->end_cb = msn_xfer_end_cb;
 	slpcall->progress_cb = msn_xfer_progress_cb;
 	slpcall->cb = msn_xfer_completed_cb;
 	slpcall->xfer = xfer;