changeset 10540:b08a37897395

[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>
author Mark Doliner <mark@kingant.net>
date Mon, 24 Jan 2005 23:43:14 +0000
parents 5a50946954dd
children 5364929fad9b
files COPYRIGHT src/protocols/oscar/oscar.c
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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, '"');