# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1211548088 0
# Node ID 56d958e7b7d16dea3791d9f574dea2e72c4e9949
# Parent  f057f9533634c9571b89b95bbf5c4e1c699e2490
Fix a TODO uncovered by Mark the other day. Instead of using a hacky
content-type with appended \r\n to make the message attribute look like
part of the body, just put the ID: 1 in the body of the message for the
nudge datacast.

diff -r f057f9533634 -r 56d958e7b7d1 libpurple/protocols/msn/msg.c
--- a/libpurple/protocols/msn/msg.c	Fri May 23 13:04:50 2008 +0000
+++ b/libpurple/protocols/msn/msg.c	Fri May 23 13:08:08 2008 +0000
@@ -151,10 +151,9 @@
 	MsnMessage *msg;
 
 	msg = msn_message_new(MSN_MSG_NUDGE);
-	/* TODO: This shouldn't have a \r\n in it, should it?? */
-	msn_message_set_content_type(msg, "text/x-msnmsgr-datacast\r\n");
+	msn_message_set_content_type(msg, "text/x-msnmsgr-datacast");
 	msn_message_set_flag(msg, 'N');
-	msn_message_set_attr(msg,"ID","1\r\n");
+	msn_message_set_bin_data(msg, "ID: 1\r\n", 7);
 
 	return msg;
 }
diff -r f057f9533634 -r 56d958e7b7d1 libpurple/protocols/msnp9/msg.c
--- a/libpurple/protocols/msnp9/msg.c	Fri May 23 13:04:50 2008 +0000
+++ b/libpurple/protocols/msnp9/msg.c	Fri May 23 13:08:08 2008 +0000
@@ -158,10 +158,9 @@
 	MsnMessage *msg;
 
 	msg = msn_message_new(MSN_MSG_NUDGE);
-	/* TODO: This shouldn't have a \r\n in it, should it?? */
-	msn_message_set_content_type(msg, "text/x-msnmsgr-datacast\r\n");
+	msn_message_set_content_type(msg, "text/x-msnmsgr-datacast");
 	msn_message_set_flag(msg, 'N');
-	msn_message_set_attr(msg,"ID","1\r\n");
+	msn_message_set_bin_data(msg, "ID: 1\r\n", 7);
 
 	return msg;
 }