# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1053401557 0
# Node ID c6efac0e28ffae298a23ee2ed2a2de0e6bccd7ed
# Parent  a57165ee5666eab55b41ec7964ddff46a4f29dc8
[gaim-migrate @ 5842]
Fixed the bug where EVERYBODY is a gaim user. This may have fixed a couple
other bugs as well.

committer: Tailor Script <tailor@pidgin.im>

diff -r a57165ee5666 -r c6efac0e28ff src/protocols/msn/msg.c
--- a/src/protocols/msn/msg.c	Tue May 20 03:11:15 2003 +0000
+++ b/src/protocols/msn/msg.c	Tue May 20 03:32:37 2003 +0000
@@ -77,6 +77,9 @@
 
 	msg = msn_message_new();
 
+	/* Clear out the old stuff. */
+	msn_message_set_attr(msg, "User-Agent", NULL);
+
 	tmp = g_strdup(str);
 
 	GET_NEXT(tmp); /* Skip MSG */
diff -r a57165ee5666 -r c6efac0e28ff src/protocols/msn/servconn.c
--- a/src/protocols/msn/servconn.c	Tue May 20 03:11:15 2003 +0000
+++ b/src/protocols/msn/servconn.c	Tue May 20 03:32:37 2003 +0000
@@ -100,7 +100,7 @@
 	}
 
 	gaim_debug(GAIM_DEBUG_MISC, "msn",
-			   "Message: {%s}\n", msn_message_get_body(msg));
+			   "Message: {%s}\n", buffer);
 
 	cb(servconn, msg);
 
diff -r a57165ee5666 -r c6efac0e28ff src/protocols/msn/switchboard.c
--- a/src/protocols/msn/switchboard.c	Tue May 20 03:11:15 2003 +0000
+++ b/src/protocols/msn/switchboard.c	Tue May 20 03:32:37 2003 +0000
@@ -273,9 +273,14 @@
 
 	body = g_strdup(msn_message_get_body(msg));
 
+	gaim_debug(GAIM_DEBUG_INFO, "msn", "Checking User-Agent...\n");
+
 	if ((value = msn_message_get_attr(msg, "User-Agent")) != NULL) {
-		if (!g_ascii_strncasecmp(value, "Gaim", 4))
+		gaim_debug(GAIM_DEBUG_MISC, "msn", "value = '%s'\n", value);
+		if (!g_ascii_strncasecmp(value, "Gaim", 4)) {
+			gaim_debug(GAIM_DEBUG_INFO, "msn", "Setting GAIMUSER flag.\n");
 			flags |= IM_FLAG_GAIMUSER;
+		}
 	}
 
 	if ((value = msn_message_get_attr(msg, "X-MMS-IM-Format")) != NULL) {