changeset 11595:ecd49b9a48b7

[gaim-migrate @ 13865] Fix a msn ft crash that I introduced. committer: Tailor Script <tailor@pidgin.im>
author Daniel Atallah <daniel.atallah@gmail.com>
date Mon, 03 Oct 2005 02:59:17 +0000
parents 8ee38f9428d5
children 944dadd28161
files src/protocols/msn/slp.c src/protocols/msn/slplink.c
diffstat 2 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/msn/slp.c	Mon Oct 03 01:47:59 2005 +0000
+++ b/src/protocols/msn/slp.c	Mon Oct 03 02:59:17 2005 +0000
@@ -156,7 +156,6 @@
 					  gsize size)
 {
 	gaim_xfer_set_completed(slpcall->xfer, TRUE);
-	msn_slp_call_close(slpcall);
 }
 
 /**************************************************************************
--- a/src/protocols/msn/slplink.c	Mon Oct 03 01:47:59 2005 +0000
+++ b/src/protocols/msn/slplink.c	Mon Oct 03 02:59:17 2005 +0000
@@ -278,13 +278,15 @@
 	else
 	{
 		/* The whole message has been sent */
-
 		if (slpmsg->flags == 0x20 || slpmsg->flags == 0x1000030)
 		{
-			if ((slpmsg->slpcall != NULL) &&
-				(slpmsg->slpcall->cb != NULL))
+			if (slpmsg->slpcall != NULL)
 			{
-				slpmsg->slpcall->cb(slpmsg->slpcall, NULL, 0);
+				if (slpmsg->slpcall->cb)
+					slpmsg->slpcall->cb(slpmsg->slpcall,
+						NULL, 0);
+
+				msn_slp_call_destroy(slpmsg->slpcall);
 			}
 		}
 	}