diff libpurple/protocols/msn/slpcall.c @ 24338:9b253ce969d0

msn_slplink_remove_slpcall() shouldn't be responsible for setting slpcall->slplink to NULL. In fact, msn_slp_call_destroy() shouldn't even call msn_slplink_remove_slpcall() until it knows that it doesn't need the slplink anymore. So move the call to msn_slplink_remove_slpcall() further down in that function. Now we no longer need the return value from msn_switchboard_release(). That return value, by the way, was dumb. If you're no longer using the MsnSwitchBoard then you're not using it and you shouldn't care if it was destroyed or not.

--- a/libpurple/protocols/msn/slpcall.c	Thu Nov 13 06:57:20 2008 +0000
+++ b/libpurple/protocols/msn/slpcall.c	Thu Nov 13 07:22:39 2008 +0000
@@ -110,8 +110,6 @@
 
 	session = slpcall->slplink->session;
 
-	msn_slplink_remove_slpcall(slpcall->slplink, slpcall);
-
 	if (slpcall->end_cb != NULL)
 		slpcall->end_cb(slpcall, session);
 
@@ -120,6 +118,8 @@
 		purple_xfer_unref(slpcall->xfer);
 	}
 
+	msn_slplink_remove_slpcall(slpcall->slplink, slpcall);
+
 	g_free(slpcall->id);
 	g_free(slpcall->branch);
 	g_free(slpcall->data_info);