# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1200602688 0
# Node ID 3c814c64a507d9cbecd064b112cec6ade15ca564
# Parent  2fb026d3f42b44f9073df8c31e2d73da05dc875d# Parent  6edcab92fb1dfd7fcd41802262d5e3456aefaa51
merge of '4b5e932e01a84088124dee9791809545cdc9240b'
     and 'e4081b0fea9b2e91db9a532aa729cfc1c078f287'

diff -r 6edcab92fb1d -r 3c814c64a507 pidgin/gtkimhtml.c
--- a/pidgin/gtkimhtml.c	Thu Jan 17 08:26:49 2008 +0000
+++ b/pidgin/gtkimhtml.c	Thu Jan 17 20:44:48 2008 +0000
@@ -1455,9 +1455,6 @@
 	gtk_text_buffer_create_tag(imhtml->text_buffer, "SUP", "rise", 5000, NULL);
 	gtk_text_buffer_create_tag(imhtml->text_buffer, "PRE", "family", "Monospace", NULL);
 	gtk_text_buffer_create_tag(imhtml->text_buffer, "search", "background", "#22ff00", "weight", "bold", NULL);
-#if GTK_CHECK_VERSION(2,8,0)
-	gtk_text_buffer_create_tag(imhtml->text_buffer, "comment", "invisible", FALSE, NULL);
-#endif
 
 	/* When hovering over a link, we show the hand cursor--elsewhere we show the plain ol' pointer cursor */
 	imhtml->hand_cursor = gdk_cursor_new (GDK_HAND2);
@@ -2984,15 +2981,10 @@
 
 					gtk_text_buffer_insert(imhtml->text_buffer, iter, ws, wpos);
 
-#if GTK_CHECK_VERSION(2,8,0)
-					wpos = g_snprintf (ws, len, "%s", tag);
-					gtk_text_buffer_insert_with_tags_by_name(imhtml->text_buffer, iter, ws, wpos, "comment", NULL);
-#else
 					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);
 					}
-#endif
 					ws[0] = '\0'; wpos = 0;
 
 					/* NEW_BIT (NEW_COMMENT_BIT); */
@@ -3138,12 +3130,6 @@
 void       gtk_imhtml_show_comments    (GtkIMHtml        *imhtml,
 					gboolean          show)
 {
-#if GTK_CHECK_VERSION(2,8,0)
-	GtkTextTag *tag;
-	tag = gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(imhtml->text_buffer), "comment");
-	if (tag)
-		g_object_set(G_OBJECT(tag), "invisible", !show, NULL);
-#endif
 	imhtml->show_comments = show;
 }