soc.2010.msn-tlc: 07bffe8f: Remove msgs list from SlpMessage.

[masca at cpw.pidgin.im]

-----------------------------------------------------------------
Revision: 07bffe8f618593d5af66f72274a5bbe6e6aea860
Ancestor: 5eb804b69f1e0178ee1fc4f330757386133b2256
Author: masca at cpw.pidgin.im
Date: 2010-06-22T23:00:10
Branch: im.pidgin.soc.2010.msn-tlc
URL: http://d.pidgin.im/viewmtn/revision/info/07bffe8f618593d5af66f72274a5bbe6e6aea860

Modified files:
        libpurple/protocols/msn/sbconn.c
        libpurple/protocols/msn/slpmsg.c
        libpurple/protocols/msn/slpmsg.h

ChangeLog: 

Remove msgs list from SlpMessage.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/sbconn.c	6b057658aeaf01c5b55fbd49684c72092f91ad90
+++ libpurple/protocols/msn/sbconn.c	485832d2a7106cd14362654a0c00108c149eb735
@@ -4,6 +4,7 @@
 #include "msg.h"
 #include "sbconn.h"
 
+#if 0
 /* We have received the message ack */
 void
 msn_sbconn_msg_ack(MsnMessage *msg, void *data)
@@ -62,6 +63,7 @@ msn_sbconn_msg_nak(MsnMessage *msg, void
 	slpmsg->msgs = g_list_remove(slpmsg->msgs, msg);
 	msn_message_unref(msg);
 }
+#endif
 
 void msn_sbconn_send_msg(MsnSlpLink *slplink, MsnMessage *msg)
 {
============================================================
--- libpurple/protocols/msn/slpmsg.c	ecf1b880b1dc93d7303f1c015bd6abb857d530fc
+++ libpurple/protocols/msn/slpmsg.c	a9715e582d77760a61297e37c6792c27dda0eec4
@@ -109,6 +109,7 @@ msn_slpmsg_destroy(MsnSlpMessage *slpmsg
 	if (slpmsg->img == NULL)
 		g_free(slpmsg->buffer);
 
+#if 0
 	for (cur = slpmsg->msgs; cur != NULL; cur = g_list_delete_link(cur, cur))
 	{
 		/* Something is pointing to this slpmsg, so we should remove that
@@ -124,6 +125,7 @@ msn_slpmsg_destroy(MsnSlpMessage *slpmsg
 	}
 
 	slplink->slp_msgs = g_list_remove(slplink->slp_msgs, slpmsg);
+#endif
 
 	for (cur = slpmsg->parts; cur != NULL; cur = g_list_delete_link(cur, cur))
 	{
============================================================
--- libpurple/protocols/msn/slpmsg.h	4dccd8e99a23e546248c2bd322478f8ecfb4f685
+++ libpurple/protocols/msn/slpmsg.h	8a2aa89a6093d245bac337a1318953161b6f05ee
@@ -74,10 +74,10 @@ struct _MsnSlpMessage
 	 */
 	long long size;
 
-	GList *msgs; /**< The real messages. */
 	GList *parts; /**< A list with the SlpMsgParts */
 
 #if 0
+	GList *msgs; /**< The real messages. */
 	MsnMessage *msg; /**< The temporary real message that will be sent. */
 #endif