Mercurial > pidgin

diff libpurple/protocols/msn/slp.c @ 23626:96e78c0fa32b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Get rid of MsnSlpSession entirely. It only seems to link to MsnSlpCall and then copy some data from it. Fixes #1671.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 01 Aug 2008 02:04:36 +0000
parents cab5420c3879
children d88fd0d9cb57
line wrap: on
line diff
--- a/libpurple/protocols/msn/slp.c	Fri Aug 01 02:02:07 2008 +0000
+++ b/libpurple/protocols/msn/slp.c	Fri Aug 01 02:04:36 2008 +0000
@@ -25,7 +25,6 @@
 #include "slp.h"
 #include "slpcall.h"
 #include "slpmsg.h"
-#include "slpsession.h"
 
 #include "object.h"
 #include "user.h"
@@ -256,7 +255,6 @@
 		/* Emoticon or UserDisplay */
 		char *content;
 		gsize len;
-		MsnSlpSession *slpsession;
 		MsnSlpLink *slplink;
 		MsnSlpMessage *slpmsg;
 		MsnObject *obj;
@@ -306,14 +304,10 @@
 			g_return_if_reached();
 		}
 
-		slpsession = msn_slplink_find_slp_session(slplink,
-												  slpcall->session_id);
-
 		/* DATA PREP */
 		slpmsg = msn_slpmsg_new(slplink);
 		slpmsg->slpcall = slpcall;
-		slpmsg->slpsession = slpsession;
-		slpmsg->session_id = slpsession->id;
+		slpmsg->session_id = slpcall->session_id;
 		msn_slpmsg_set_body(slpmsg, NULL, 4);
 #ifdef MSN_DEBUG_SLP
 		slpmsg->info = "SLP DATA PREP";
@@ -323,7 +317,6 @@
 		/* DATA */
 		slpmsg = msn_slpmsg_new(slplink);
 		slpmsg->slpcall = slpcall;
-		slpmsg->slpsession = slpsession;
 		slpmsg->flags = 0x20;
 #ifdef MSN_DEBUG_SLP
 		slpmsg->info = "SLP DATA";