# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1271176021 0
# Node ID 0625cebc84d783dce733ff495f63ae10187324bf
# Parent  62d51ab581a5210c8a03dc92be26336ba67fbf48
Use cute little "¡ß" on the close buttons in conversation tabs.

The stock icons make the tabs too large, and they look huuge, compared to
the status icon and the text on the tab, even with all the style-editing
to remove borders etc. We still use 'buttons', instead of event-boxes, so
we don't have to capture mouse-events and do mouseover/mouseout effects
ourselves. This change simply removes the use of the stock icon and uses
a "¡ß" label in the button. This looks and feels betterer. Refs #8727.

diff -r 62d51ab581a5 -r 0625cebc84d7 ChangeLog
--- a/ChangeLog	Mon Apr 12 23:21:16 2010 +0000
+++ b/ChangeLog	Tue Apr 13 16:27:01 2010 +0000
@@ -36,7 +36,6 @@
 	  in the distant past.  (Greg McNew)
 	* Added a menu set mood globally for all mood-supporting accounts
 	  (currently XMPP and ICQ).
-	* Use standard (but small) GTK+ buttons instead of custom "X" symbol.
 	* Default binding of Ctrl+Shift+v to 'Paste as Plain Text' in
 	  conversation windows. This can be changed in .gtkrc-2.0. For example,
 	  Ctrl+v can be bound to 'Paste as Plain Text' by default.
diff -r 62d51ab581a5 -r 0625cebc84d7 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Mon Apr 12 23:21:16 2010 +0000
+++ b/pidgin/gtkconv.c	Tue Apr 13 16:27:01 2010 +0000
@@ -4866,12 +4866,11 @@
 pidgin_conv_setup_quickfind(PidginConversation *gtkconv, GtkWidget *container)
 {
 	GtkWidget *widget = gtk_hbox_new(FALSE, 0);
-	GtkWidget *label, *entry, *close, *image;
+	GtkWidget *label, *entry, *close;
 
 	gtk_box_pack_start(GTK_BOX(container), widget, FALSE, FALSE, 0);
 
-	image = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
-	close = pidgin_create_small_button(image);
+	close = pidgin_create_small_button(gtk_label_new("×"));
 	gtk_box_pack_start(GTK_BOX(widget), close, FALSE, FALSE, 0);
 	gtk_tooltips_set_tip(gtkconv->tooltips, close,
 	                     _("Close Find bar"), NULL);
@@ -9450,7 +9449,6 @@
 	GtkWidget *tab_cont = gtkconv->tab_cont;
 	PurpleConversationType conv_type;
 	const gchar *tmp_lab;
-	GtkWidget *close_image;
 
 	conv_type = purple_conversation_get_type(conv);
 
@@ -9462,8 +9460,7 @@
 
 
 	/* Close button. */
-	close_image = gtk_image_new_from_stock(GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
-	gtkconv->close = pidgin_create_small_button(close_image);
+	gtkconv->close = pidgin_create_small_button(gtk_label_new("×"));
 	gtk_tooltips_set_tip(gtkconv->tooltips, gtkconv->close,
 	                     _("Close conversation"), NULL);
 
diff -r 62d51ab581a5 -r 0625cebc84d7 pidgin/gtkutils.c
--- a/pidgin/gtkutils.c	Mon Apr 12 23:21:16 2010 +0000
+++ b/pidgin/gtkutils.c	Tue Apr 13 16:27:01 2010 +0000
@@ -3484,6 +3484,9 @@
 	                    "GtkWidget::focus-line-width = 0\n"
 	                    "xthickness = 0\n"
 	                    "ythickness = 0\n"
+	                    "GtkContainer::border-width = 0\n"
+	                    "GtkButton::inner-border = {0, 0, 0, 0}\n"
+	                    "GtkButton::default-border = {0, 0, 0, 0}\n"
 	                    "}\n"
 	                    "widget \"*.pidgin-small-close-button\" style \"pidgin-small-close-button\"");