changeset 28796:5d8867f11f0d

If we're sending a file, and libpurple tells us to cancel it, then just set the slpcall->wasted flag. Upper level code should take care of destroying it without getting confused. Refs #6523.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 14 Dec 2009 05:42:16 +0000
parents bffe098efca2
children dc7b50d09922
files libpurple/protocols/msn/slp.c
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/slp.c	Mon Dec 14 05:24:20 2009 +0000
+++ b/libpurple/protocols/msn/slp.c	Mon Dec 14 05:42:16 2009 +0000
@@ -128,7 +128,10 @@
 			g_free(content);
 			msn_slplink_send_queued_slpmsgs(slpcall->slplink);
 
-			msn_slpcall_destroy(slpcall);
+			if (purple_xfer_get_type(xfer) == PURPLE_XFER_SEND)
+				slpcall->wasted = TRUE;
+			else
+				msn_slpcall_destroy(slpcall);
 		}
 	}
 }