pidgin: 27665a8b: If we're sending a file, and libpurple t...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 27665a8b222aae5ab3dfaeea99ba9ff9afc5c832
Ancestor: 700a97f591b7815717184f6ea2fbee1de00577fc
Author: qulogic at pidgin.im
Date: 2009-12-14T05:42:16
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/27665a8b222aae5ab3dfaeea99ba9ff9afc5c832

Modified files:
        libpurple/protocols/msn/slp.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/slp.c	5dd673d14c5f7dee82b1df46f7ef683d6408871d
+++ libpurple/protocols/msn/slp.c	1da3afd0c3ca769e04271f9895e47c1ea4e7ca65
@@ -128,7 +128,10 @@ msn_xfer_cancel(PurpleXfer *xfer)
 			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);
 		}
 	}
 }