diff src/gtkimhtml.c @ 8881:1ab2a9c17f4a

[gaim-migrate @ 9650] I'm going to thoroughly remove the prefs that we're sure about. Starting with the show_smileys one. I also tagged the commented out preferences with /* PREFSLASH04 */ to make them easily findable. And got rid of a compile warning or 5. committer: Tailor Script <[e-mail]>

--- a/src/gtkimhtml.c	Thu May 06 04:41:24 2004 +0000
+++ b/src/gtkimhtml.c	Thu May 06 04:44:33 2004 +0000
@@ -968,7 +968,6 @@
 	imhtml->arrow_cursor = gdk_cursor_new (GDK_LEFT_PTR);
 	imhtml->text_cursor = gdk_cursor_new (GDK_XTERM);
 
-	imhtml->show_smileys = TRUE;
 	imhtml->show_comments = TRUE;
 
 	imhtml->zoom = 1.0;
@@ -2323,7 +2322,7 @@
 			pos += tlen;
 			if(tag)
 				g_free(tag); /* This was allocated back in VALID_TAG() */
-		} else if (imhtml->show_smileys && (gtk_imhtml_is_smiley (imhtml, fonts, c, &smilelen) || gtk_imhtml_is_smiley(imhtml, NULL, c, &smilelen))) {
+		} else if (gtk_imhtml_is_smiley (imhtml, fonts, c, &smilelen) || gtk_imhtml_is_smiley(imhtml, NULL, c, &smilelen)) {
 			GtkIMHtmlFontDetail *fd;
 
 			gchar *sml = NULL;
@@ -2450,12 +2449,6 @@
 	imhtml->default_smilies = gtk_smiley_tree_new();
 }
 
-void       gtk_imhtml_show_smileys     (GtkIMHtml        *imhtml,
-					gboolean          show)
-{
-	imhtml->show_smileys = show;
-}
-
 void       gtk_imhtml_show_comments    (GtkIMHtml        *imhtml,
 					gboolean          show)
 {
@@ -3476,11 +3469,6 @@
 	GtkTextChildAnchor *anchor;
 	char *unescaped = gaim_unescape_html(smiley);
 
-	if (!imhtml->show_smileys) {
-		gtk_text_buffer_insert(imhtml->text_buffer, iter, smiley, strlen(smiley));
-		return;
-	}
-
 	anchor = gtk_text_buffer_create_child_anchor(imhtml->text_buffer, iter);
 	g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_plaintext", unescaped, g_free);
 	g_object_set_data_full(G_OBJECT(anchor), "gtkimhtml_htmltext", g_strdup(smiley), g_free);