pidgin: 2dffa8ba: Use cute little "x" on the close buttons...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 2dffa8ba1bee1171684d1f2eda5b5ba307787274
Ancestor: 350ddaad5f7b48249a35bb326383ec402d8a64b7
Author: sadrul at pidgin.im
Date: 2010-04-13T16:27:01
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2dffa8ba1bee1171684d1f2eda5b5ba307787274

Modified files:
        ChangeLog pidgin/gtkconv.c pidgin/gtkutils.c

ChangeLog: 

Use cute little "x" 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 "x" label in the button. This looks and feels betterer. Refs #8727.


-------------- next part --------------
============================================================
--- ChangeLog	9ec5ce9419aef234146a5ef7a1382efb1b7b73dd
+++ ChangeLog	025c7f593fa389feac73d1f80c689e73a18cc1da
@@ -36,7 +36,6 @@ version 2.7.0 (??/??/????):
 	  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.
============================================================
--- pidgin/gtkconv.c	2aca4f8cf79139f2f78db30374bed707f8d1e024
+++ pidgin/gtkconv.c	e16029d77834443edabb800e46530fb476afb54a
@@ -4866,12 +4866,11 @@ pidgin_conv_setup_quickfind(PidginConver
 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("x"));
 	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 @@ pidgin_conv_window_add_gtkconv(PidginWin
 	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 @@ pidgin_conv_window_add_gtkconv(PidginWin
 
 
 	/* 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("x"));
 	gtk_tooltips_set_tip(gtkconv->tooltips, gtkconv->close,
 	                     _("Close conversation"), NULL);
 
============================================================
--- pidgin/gtkutils.c	65d75e763324176eb33aa9c39fd863cca0db94d5
+++ pidgin/gtkutils.c	902207c3b7ce7c92edcdbb95f1d15eceac560ace
@@ -3484,6 +3484,9 @@ void pidgin_utils_init(void)
 	                    "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\"");