[Gaim-commits] SF.net SVN: gaim: [18059] trunk/gtk/gtkimhtml.c

[<sa...@us...>]

Revision: 18059
          http://svn.sourceforge.net/gaim/?rev=18059&view=rev
Author:   sadrul
Date:     2006-12-26 12:40:05 -0800 (Tue, 26 Dec 2006)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/gtk/gtkimhtml.c

Modified: trunk/gtk/gtkimhtml.c
===================================================================
--- trunk/gtk/gtkimhtml.c	2006-12-26 19:22:03 UTC (rev 18058)
+++ trunk/gtk/gtkimhtml.c	2006-12-26 20:40:05 UTC (rev 18059)
@@ -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;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.