Mercurial > pidgin.yaz
changeset 10815:65c818fb218e
[gaim-migrate @ 12470]
Fix the gtkimhtml bug that caused screennames to be duplicated in AIM
profiles containing pasted conversations
committer: Tailor Script <tailor@pidgin.im>
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Mon, 11 Apr 2005 15:00:30 +0000 |
| parents | 364a2ef907ae |
| children | c94f40ffcafb |
| files | src/gtkimhtml.c |
| diffstat | 1 files changed, 5 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkimhtml.c Mon Apr 11 12:24:47 2005 +0000 +++ b/src/gtkimhtml.c Mon Apr 11 15:00:30 2005 +0000 @@ -1965,20 +1965,6 @@ if (!g_ascii_strncasecmp(string, "!--", strlen ("!--"))) { gchar *e = strstr (string + strlen("!--"), "-->"); if (e) { - /* - * If we uncomment the following line then HTML comments will be - * hidden. This is good because it means when a WinAIM users pastes - * part of a conversation to you, the screen names won't be - * duplicated (because WinAIM pastes an HTML comment containing the - * screen name, for some reason). - * - * However, uncommenting this is bad because we use HTML comment - * tags to print timestamps to conversations (at least, I think...) - * - * KingAnt thinks it would be best to display timestamps using - * something other than comment tags. - */ - /* *type = -1; */ *len = e - string + strlen ("-->"); *tag = g_strndup (string + strlen ("!--"), *len - strlen ("!---->")); return TRUE; @@ -2805,8 +2791,12 @@ gtk_text_buffer_insert(imhtml->text_buffer, iter, ws, wpos); - if (imhtml->show_comments && !(options & GTK_IMHTML_NO_COMMENTS)) + if (imhtml->show_comments && !(options & GTK_IMHTML_NO_COMMENTS)) { wpos = g_snprintf (ws, len, "%s", tag); + gtk_text_buffer_insert(imhtml->text_buffer, iter, ws, wpos); + } + ws[0] = '\0'; wpos = 0; + /* NEW_BIT (NEW_COMMENT_BIT); */ break; default: