# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1106610194 0
# Node ID b08a37897395278a96d9352e303aff4962733584
# Parent  5a50946954dd31e2d4ba7f34d2b2285782d6555b
[gaim-migrate @ 11903]
sf patch #1099978, from Magnus Hult
Apparently icq2003b sets your away message the same way AIM does.
This correctly handles some charset conversion.

committer: Tailor Script <tailor@pidgin.im>

diff -r 5a50946954dd -r b08a37897395 COPYRIGHT
--- a/COPYRIGHT	Sun Jan 23 20:32:07 2005 +0000
+++ b/COPYRIGHT	Mon Jan 24 23:43:14 2005 +0000
@@ -83,6 +83,7 @@
 Casey Ho
 Iain Holmes
 Nigel Horne
+Magnus Hult
 Karsten Huneycutt
 Rian Hunter
 Thomas Huriaux
diff -r 5a50946954dd -r b08a37897395 src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Sun Jan 23 20:32:07 2005 +0000
+++ b/src/protocols/oscar/oscar.c	Mon Jan 24 23:43:14 2005 +0000
@@ -356,8 +356,11 @@
 	g_return_val_if_fail(encoding != NULL, NULL);
 
 	/* Make sure encoding begins with charset= */
-	if (strncmp(encoding, "text/aolrtf; charset=", 21))
+	if (strncmp(encoding, "text/aolrtf; charset=", 21) &&
+		strncmp(encoding, "text/x-aolrtf; charset=", 23))
+	{
 		return NULL;
+	}
 
 	begin = strchr(encoding, '"');
 	end = strrchr(encoding, '"');