Mercurial > pidgin
changeset 15269:d728da06e0e8
[gaim-migrate @ 18059]
Fix bug #1622466 ("Don't substitute smileys in URIs") by disabling smileys for
links. This is going to cause smileys to be disabled for stuff like
"<a href='abc'>check this out ;)</a>" too. Do people use links/smileys like
this a lot? If they do, this probably needs to be reverted.
committer: Tailor Script <tailor@pidgin.im>
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Tue, 26 Dec 2006 20:40:05 +0000 |
| parents | 132db06150ca |
| children | 4458ed5f8c4c |
| files | gtk/gtkimhtml.c |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/gtk/gtkimhtml.c Tue Dec 26 19:22:03 2006 +0000 +++ b/gtk/gtkimhtml.c Tue Dec 26 20:40:05 2006 +0000 @@ -2966,7 +2966,8 @@ c += tlen; pos += tlen; g_free(tag); /* This was allocated back in VALID_TAG() */ - } else if (gtk_imhtml_is_smiley(imhtml, fonts, c, &smilelen)) { + } else if (imhtml->edit.link == NULL && + gtk_imhtml_is_smiley(imhtml, fonts, c, &smilelen)) { GtkIMHtmlFontDetail *fd; gchar *sml = NULL;