# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1086594576 0
# Node ID ac8790437abee50425caa23e3be097d7d1f4d0db
# Parent  b83905afbb555ac51d20831dacd53b76cd785f23
[gaim-migrate @ 10027]
Patch from Felipe Contreras that fixes the sent bytes being reset to 0
after sending a file, and a small check to hopefully avoid a potential
crash.

committer: Tailor Script <tailor@pidgin.im>

diff -r b83905afbb55 -r ac8790437abe src/protocols/msn/slp.c
--- a/src/protocols/msn/slp.c	Mon Jun 07 05:29:36 2004 +0000
+++ b/src/protocols/msn/slp.c	Mon Jun 07 07:49:36 2004 +0000
@@ -629,6 +629,8 @@
 		slpcall = msn_slplink_find_slp_call(slplink, call_id);
 		g_free(call_id);
 
+		g_return_val_if_fail(slpcall != NULL, NULL);
+
 		if (strncmp(status, "200 OK", 6))
 		{
 			/* It's not valid. Kill this off. */
diff -r b83905afbb55 -r ac8790437abe src/protocols/msn/slplink.c
--- a/src/protocols/msn/slplink.c	Mon Jun 07 05:29:36 2004 +0000
+++ b/src/protocols/msn/slplink.c	Mon Jun 07 07:49:36 2004 +0000
@@ -298,8 +298,8 @@
 		if ((slpmsg->slpcall != NULL) &&
 			(slpmsg->slpcall->progress_cb != NULL))
 		{
-			slpmsg->slpcall->progress_cb(slpmsg->slpcall, slpmsg->size, len,
-										slpmsg->offset);
+			slpmsg->slpcall->progress_cb(slpmsg->slpcall, slpmsg->size,
+										 len, slpmsg->offset);
 		}
 	}
 
@@ -509,10 +509,14 @@
 		g_return_if_reached();
 	}
 
-	if ((slpmsg->slpcall != NULL) &&
-		(slpmsg->slpcall->progress_cb != NULL))
+	if (slpmsg->flags == 0x20 || slpmsg->flags == 0x1000030)
 	{
-		slpmsg->slpcall->progress_cb(slpmsg->slpcall, slpmsg->size, len, offset);
+		if ((slpmsg->slpcall != NULL) &&
+			(slpmsg->slpcall->progress_cb != NULL))
+		{
+			slpmsg->slpcall->progress_cb(slpmsg->slpcall, slpmsg->size,
+										 len, offset);
+		}
 	}
 
 #if 0