# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1095647736 0
# Node ID a4ceacb1816d18b74702a25602e7df76a0344904
# Parent  eaec201b2688741c44b472c3f7e90fa7bc40363f
[gaim-migrate @ 11016]
noif made toggling the option to show close buttons on tabs work better

committer: Tailor Script <tailor@pidgin.im>

diff -r eaec201b2688 -r a4ceacb1816d src/gtkconv.c
--- a/src/gtkconv.c	Sun Sep 19 21:19:55 2004 +0000
+++ b/src/gtkconv.c	Mon Sep 20 02:35:36 2004 +0000
@@ -4646,6 +4646,7 @@
 	GtkWidget *pane = NULL;
 	GtkWidget *tab_cont;
 	GtkWidget *tabby, *menu_tabby;
+	GtkWidget *close_image;
 	gboolean new_ui;
 	GaimConversationType conv_type;
 	const char *name;
@@ -4751,9 +4752,9 @@
 	gtkconv->close = gtk_button_new();
 	gtk_widget_set_size_request(GTK_WIDGET(gtkconv->close), 16, 16);
 	gtk_button_set_relief(GTK_BUTTON(gtkconv->close), GTK_RELIEF_NONE);
-	gtk_container_add(GTK_CONTAINER(gtkconv->close),
-			  gtk_image_new_from_stock(GTK_STOCK_CLOSE,
-			  GTK_ICON_SIZE_MENU));
+	close_image = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
+	gtk_widget_show(close_image);
+	gtk_container_add(GTK_CONTAINER(gtkconv->close), close_image);
 	gtk_tooltips_set_tip(gtkconv->tooltips, gtkconv->close,
 						 _("Close conversation"), NULL);
 
@@ -4796,7 +4797,7 @@
 
 	gtk_box_pack_start(GTK_BOX(tabby), gtkconv->close, FALSE, FALSE, 0);
 	if (gaim_prefs_get_bool("/gaim/gtk/conversations/close_on_tabs"))
-		gtk_widget_show_all(gtkconv->close);
+		gtk_widget_show(gtkconv->close);
 
 	gtk_widget_show(tabby);
 	gtk_widget_show(menu_tabby);