# HG changeset patch # User Yoshiki Yazawa # Date 1279790902 -32400 # Node ID d0f40f5f2fb292bf62b487edeee16154bc9ac025 # Parent 2f96590b7b40fcdbc4337c2c415aa7b5e4ca86dc should not HTML wrap messages on non-ICQ services, otherwise non-ascii message would not be delivered. diff -r 2f96590b7b40 -r d0f40f5f2fb2 libpurple/protocols/oscar/oscar.c --- a/libpurple/protocols/oscar/oscar.c Thu Jul 22 15:37:35 2010 +0900 +++ b/libpurple/protocols/oscar/oscar.c Thu Jul 22 18:28:22 2010 +0900 @@ -4689,10 +4689,14 @@ /* Messaging an SMS (mobile) user--strip HTML */ tmp2 = purple_markup_strip_html(tmp1); is_html = FALSE; - } else { + } else if (od->icq) { /* ICQ 6 wants its HTML wrapped in these tags. Oblige it. */ tmp2 = g_strdup_printf("%s", tmp1); is_html = TRUE; + } else { + /* otherwise */ + tmp2 = g_strdup(tmp1); + is_html = FALSE; } g_free(tmp1); tmp1 = tmp2;