# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1130426152 0
# Node ID 3bfb2cffcef25f342d523905be83eb31cc2790aa
# Parent  0d793b594a235da61c7a806bdd98b590e36a788e
[gaim-migrate @ 14142]
inspired by Richard Stellingwerff's patch 1339606, this workaround for
annoying visible borders on tab close buttons is no longer required with
at least gtk 2.6 (if someone can confirm if it was fixed in 2.4 we could
remove it there too)

committer: Tailor Script <tailor@pidgin.im>

diff -r 0d793b594a23 -r 3bfb2cffcef2 src/gtkconv.c
--- a/src/gtkconv.c	Thu Oct 27 14:40:48 2005 +0000
+++ b/src/gtkconv.c	Thu Oct 27 15:15:52 2005 +0000
@@ -5800,6 +5800,7 @@
 	return FALSE;
 }
 
+#if !GTK_CHECK_VERSION(2,6,0)
 /* Courtesy of Galeon! */
 static void
 tab_close_button_state_changed_cb(GtkWidget *widget, GtkStateType prev_state)
@@ -5807,6 +5808,7 @@
 	if (GTK_WIDGET_STATE(widget) == GTK_STATE_ACTIVE)
 		gtk_widget_set_state(widget, GTK_STATE_NORMAL);
 }
+#endif
 
 static void
 notebook_init_grab(GaimGtkWindow *gtkwin, GtkWidget *widget)
@@ -6405,12 +6407,15 @@
 	g_signal_connect(G_OBJECT(gtkconv->close), "clicked",
 	                 G_CALLBACK(close_conv_cb), gtkconv);
 
+#if !GTK_CHECK_VERSION(2,6,0)
 	/*
 	* I love Galeon. They have a fix for that stupid annoying visible
 	* border bug. I love you guys! -- ChipX86
 	*/
+	/* This is fixed properly in some version of Gtk before 2.6.0  */
 	g_signal_connect(G_OBJECT(gtkconv->close), "state_changed",
 	                 G_CALLBACK(tab_close_button_state_changed_cb), NULL);
+#endif
 
 	/* Status icon. */
 	gtkconv->icon = gtk_image_new();