pidgin: 97a20dd5: Fix a TODO uncovered by Mark the other d...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 97a20dd56598fa5c690eabcbc8ec3ff6e560aefd
Ancestor: 88f9c072e0ed10bb5c72deae11b788e28a2570ab
Author: nosnilmot at pidgin.im
Date: 2008-05-23T13:08:08
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/97a20dd56598fa5c690eabcbc8ec3ff6e560aefd

Modified files:
        libpurple/protocols/msn/msg.c
        libpurple/protocols/msnp9/msg.c

ChangeLog: 

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.


-------------- next part --------------
============================================================
--- libpurple/protocols/msn/msg.c	ee4fe6710de12cdec6963878f04b6c69af81b16c
+++ libpurple/protocols/msn/msg.c	9a8e954ebaaca009d1ce9d3bca87bd4c1a6e12ec
@@ -151,10 +151,9 @@ msn_message_new_nudge(void)
 	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;
 }
============================================================
--- libpurple/protocols/msnp9/msg.c	440386f3df72373a70d473ec4ffc289ca2526db5
+++ libpurple/protocols/msnp9/msg.c	9fd8feb881a47cafd28b030a9394b2d3883ee237
@@ -158,10 +158,9 @@ msn_message_new_nudge(void)
 	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;
 }