pidgin: df294a59: If we're setting swboard here then we ne...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: df294a592c63223f97747054b7d4352b987a7661
Ancestor: 4ae9ef6467537045dc0ea5d62c4f3d28ae9a4bcb
Author: markdoliner at pidgin.im
Date: 2008-11-15T01:51:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/df294a592c63223f97747054b7d4352b987a7661

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

ChangeLog: 

If we're setting swboard here then we need to add the slplink to the
linked list

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/slp.c	18d0dbc09dc3b63c5ecbd6a534d621b24663c527
+++ libpurple/protocols/msn/slp.c	75ddba27c8537b193d1268d08fe4e4a6cf807695
@@ -758,17 +758,17 @@ msn_p2p_msg(MsnCmdProc *cmdproc, MsnMess
 
 	if (slplink->swboard == NULL)
 	{
+		/*
+		 * We will need swboard in order to change its flags.  If its
+		 * NULL, something has probably gone wrong earlier on.  I
+		 * didn't want to do this, but MSN 7 is somehow causing us
+		 * to crash here, I couldn't reproduce it to debug more,
+		 * and people are reporting bugs. Hopefully this doesn't
+		 * cause more crashes. Stu.
+		 */
 		if (cmdproc->data == NULL)
 			g_warning("msn_p2p_msg cmdproc->data was NULL\n");
 		else {
-			/*
-			 * We will swboard in order to change its flags.  If its
-			 * NULL, something has probably gone wrong earlier on.  I
-			 * didn't want to do this, but MSN 7 is somehow causing us
-			 * to crash here, I couldn't reproduce it to debug more,
-			 * and people are reporting bugs. Hopefully this doesn't
-			 * cause more crashes. Stu.
-			 */
 			slplink->swboard = (MsnSwitchBoard *)cmdproc->data;
 			slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink);
 		}
@@ -857,6 +857,7 @@ msn_emoticon_msg(MsnCmdProc *cmdproc, Ms
 				 */
 				slplink->swboard->slplinks = g_list_remove(slplink->swboard->slplinks, slplink);
 			slplink->swboard = swboard;
+			slplink->swboard->slplinks = g_list_prepend(slplink->swboard->slplinks, slplink);
 		}
 
 		/* If the conversation doesn't exist then this is a custom smiley