changeset 9715:b030f83693da

[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>
author Christian Hammond <chipx86@chipx86.com>
date Sun, 08 Aug 2004 08:17:38 +0000
parents 2273790bb518
children 8158d148b3c2
files ChangeLog src/protocols/msn/slp.h src/protocols/msn/slplink.c
diffstat 3 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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:
--- 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_ */
--- 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;