--- a/libpurple/util.c Fri Nov 09 18:00:14 2007 +0000
+++ b/libpurple/util.c Fri Nov 09 18:06:54 2007 +0000
@@ -1369,7 +1369,9 @@
g_string_append_printf(xhtml, "</%s>", pt->dest_tag);
if(plain && !strcmp(pt->src_tag, "a")) {
/* if this is a link, we have to add the url to the plaintext, too */
- if (cdata && url && !g_string_equal(cdata, url))
+ if (cdata && url &&
+ (!g_string_equal(cdata, url) && (g_ascii_strncasecmp(url->str, "mailto:", 7) != 0 ||
+ g_utf8_collate(url->str + 7, cdata->str) != 0)))
g_string_append_printf(plain, " <%s>", g_strstrip(url->str));
if (cdata) {
g_string_free(cdata, TRUE);
@@ -1729,6 +1731,8 @@
xhtml = g_string_append_len(xhtml, c, len);
if(plain)
plain = g_string_append(plain, pln);
+ if(cdata)
+ cdata = g_string_append_len(cdata, c, len);
c += len;
} else {
if(xhtml)
@@ -1754,6 +1758,8 @@
*plain_out = g_string_free(plain, FALSE);
if(url)
g_string_free(url, TRUE);
+ if (cdata)
+ g_string_free(cdata, TRUE);
}
/* The following are probably reasonable changes: