Mercurial > pidgin.yaz

changeset 30708:d0f40f5f2fb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
should not HTML wrap messages on non-ICQ services, otherwise non-ascii message would not be delivered.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 22 Jul 2010 18:28:22 +0900
parents 2f96590b7b40
children 8dc749893b7b
files libpurple/protocols/oscar/oscar.c
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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("<HTML><BODY>%s</BODY></HTML>", tmp1);
 			is_html = TRUE;
+		} else {
+			/* otherwise */
+			tmp2 = g_strdup(tmp1);
+			is_html = FALSE;
 		}
 		g_free(tmp1);
 		tmp1 = tmp2;