# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1041312257 0
# Node ID 3f267c74e50ab96731f38a9bec2236eac8610650
# Parent  a638bc9454a65ed533c3556f3d77d5d29275c074
[gaim-migrate @ 4387]
A few days ago I added a feature that sometimes put cool little
random characters after people's aim info or away messages.
Unfortunately, the world just isn't ready for this feature,
so I feel obligated to remove it.  I'm sorry.  He would have
wanted it this way.

committer: Tailor Script <tailor@pidgin.im>

diff -r a638bc9454a6 -r 3f267c74e50a src/protocols/oscar/msgcookie.c
--- a/src/protocols/oscar/msgcookie.c	Tue Dec 31 05:23:12 2002 +0000
+++ b/src/protocols/oscar/msgcookie.c	Tue Dec 31 05:24:17 2002 +0000
@@ -131,15 +131,14 @@
 }
 
 #if 0 /* debugging feature */
-faim_internal int aim_dumpcookie(aim_msgcookie_t *cookie) 
+faim_internal int aim_dumpcookie(aim_session_t *sess, aim_msgcookie_t *cookie) 
 {
 
 	if (!cookie)
 		return -EINVAL;
 
-	printf("\tCookie at %p: %d/%s with %p, next %p\n", 
-			cookie, cookie->type, cookie->cookie, 
-			cookie->data, cookie->next);
+	faimdprintf(sess, 0, "\tCookie at %p: %d/%s with %p, next %p\n", cookie, 
+			cookie->type, cookie->cookie, cookie->data, cookie->next);
 
 	return 0;
 }
diff -r a638bc9454a6 -r 3f267c74e50a src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Tue Dec 31 05:23:12 2002 +0000
+++ b/src/protocols/oscar/oscar.c	Tue Dec 31 05:24:17 2002 +0000
@@ -2644,7 +2644,7 @@
 		flags = parse_encoding (text_enc);
 		switch (flags) {
 		case 0:
-			utf8 = g_strdup(text);
+			utf8 = g_strndup(text, text_len);
 			break;
 		case AIM_IMFLAGS_UNICODE:
 			utf8 = g_convert(text, text_len, "UTF-8", "UCS-2BE", NULL, NULL, NULL);