Mercurial > pidgin

diff src/protocols/msn/slp.c @ 10345:2e01c503aa4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 11556] Patch 1078151 from Felipe Contreras to fix some more MSN bugs: "User Dislpay messages, and other less used, did not set an slpcall, so the callback that should not be called, was called (in some very special cases)." ... "Here it goes the real real one, as far as I can tell. Cleaning + organizing + documentation + hard bug fix = big patch." -- Felipe Contreras I also fixed drag-and-drop to conversation window file transfers (which I had broken when I fixed some other dnd thing), made the debug output of the autoreconnect plugin more useful, and stopped the message notification plugin notifying you for messages sent by ignored users. committer: Tailor Script <tailor@pidgin.im>
author Stu Tomlinson <stu@nosnilmot.com>
date Sat, 11 Dec 2004 20:01:58 +0000
parents a7b2fd5efcf2
children e5455f1dc9b6
line wrap: on
line diff
--- a/src/protocols/msn/slp.c	Sat Dec 11 00:06:06 2004 +0000
+++ b/src/protocols/msn/slp.c	Sat Dec 11 20:01:58 2004 +0000
@@ -205,7 +205,7 @@
 								"MSNSLP/1.0 200 OK",
 								branch, type, content);
 
-#ifdef DEBUG_SLP
+#ifdef MSN_DEBUG_SLP
 	slpmsg->info = "SLP 200 OK";
 	slpmsg->text_body = TRUE;
 #endif
@@ -229,7 +229,7 @@
 								"MSNSLP/1.0 603 Decline",
 								branch, type, content);
 
-#ifdef DEBUG_SLP
+#ifdef MSN_DEBUG_SLP
 	slpmsg->info = "SLP 603 Decline";
 	slpmsg->text_body = TRUE;
 #endif
@@ -295,19 +295,21 @@
 
 		/* DATA PREP */
 		slpmsg = msn_slpmsg_new(slplink);
+		slpmsg->slpcall = slpcall;
 		slpmsg->slpsession = slpsession;
 		slpmsg->session_id = slpsession->id;
 		msn_slpmsg_set_body(slpmsg, NULL, 4);
-#ifdef DEBUG_SLP
+#ifdef MSN_DEBUG_SLP
 		slpmsg->info = "SLP DATA PREP";
 #endif
 		msn_slplink_queue_slpmsg(slplink, slpmsg);
 
 		/* DATA */
 		slpmsg = msn_slpmsg_new(slplink);
+		slpmsg->slpcall = slpcall;
 		slpmsg->slpsession = slpsession;
 		slpmsg->flags = 0x20;
-#ifdef DEBUG_SLP
+#ifdef MSN_DEBUG_SLP
 		slpmsg->info = "SLP DATA";
 #endif
 		msn_slpmsg_open_file(slpmsg, file_name);
@@ -383,7 +385,7 @@
 								"\r\n");
 	g_free(header);
 
-#ifdef DEBUG_SLP
+#ifdef MSN_DEBUG_SLP
 	slpmsg->info = "SLP BYE";
 	slpmsg->text_body = TRUE;
 #endif
@@ -553,7 +555,7 @@
 										"application/x-msnmsgr-transreqbody",
 										content);
 
-#ifdef DEBUG_SLP
+#ifdef MSN_DEBUG_SLP
 			slpmsg->info = "SLP INVITE";
 			slpmsg->text_body = TRUE;
 #endif