Fix for too-small notebook tab close buttons. Fixes bug #144772.

2004-09-13  Christian Persch  <chpe@cvs.gnome.org>

	* data/art/Makefile.am:
	* data/art/epiphany-close-tab.png:
	* lib/ephy-stock-icons.c: (ephy_stock_icons_init):
	* src/ephy-notebook.c: (build_tab_label):

	Fix for too-small notebook tab close buttons. Fixes bug #144772.

5 files changed, 16 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 03288d03d..1dd9b06f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2004-09-13  Christian Persch  <chpe@cvs.gnome.org>
 
+	* data/art/Makefile.am:
+	* data/art/epiphany-close-tab.png:
+	* lib/ephy-stock-icons.c: (ephy_stock_icons_init):
+	* src/ephy-notebook.c: (build_tab_label):
+
+	Fix for too-small notebook tab close buttons. Fixes bug #144772.
+
+2004-09-13  Christian Persch  <chpe@cvs.gnome.org>
+
 	* src/ephy-go-action.c: (connect_proxy):
 	* src/ephy-navigation-action.c: (connect_proxy):
 
diff --git a/data/art/Makefile.am b/data/art/Makefile.am
index cc27b7231..7a6929657 100644
--- a/data/art/Makefile.am
+++ b/data/art/Makefile.am
@@ -1,4 +1,5 @@
 art_DATA = \
+	epiphany-close-tab.png \
 	epiphany-secure.png	\
 	epiphany-unsecure.png	\
 	epiphany-entry.png \
diff --git a/data/art/epiphany-close-tab.png b/data/art/epiphany-close-tab.png
new file mode 100644
index 000000000..43a549aa1
--- /dev/null
+++ b/data/art/epiphany-close-tab.png
diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c
index 6134dce4e..715510d6a 100644
--- a/lib/ephy-stock-icons.c
+++ b/lib/ephy-stock-icons.c
@@ -94,4 +94,6 @@ ephy_stock_icons_init (void)
 	}
 
 	g_object_unref (G_OBJECT (factory));
+
+	gtk_icon_size_register (EPHY_ICON_SIZE_TAB_BUTTON, 10, 10);
 }
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index 5651b2e98..c359f5c59 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -25,6 +25,7 @@
 #endif
 
 #include "ephy-notebook.h"
+#include "ephy-stock-icons.h"
 #include "eel-gconf-extensions.h"
 #include "ephy-prefs.h"
 #include "ephy-marshal.h"
@@ -844,12 +845,10 @@ build_tab_label (EphyNotebook *nb, EphyTab *tab)
 {
 	GtkWidget *window, *hbox, *label_hbox, *label_ebox;
 	GtkWidget *label, *close_button, *image, *spinner, *icon;
-	int h = -1, w = -1;
+	GtkIconSize close_icon_size;
 
 	window = gtk_widget_get_toplevel (GTK_WIDGET (nb));
 
-	gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h);
-
 	/* set hbox spacing and label padding (see below) so that there's an
 	 * equal amount of space around the label */
 	hbox = gtk_hbox_new (FALSE, 4);
@@ -865,9 +864,8 @@ build_tab_label (EphyNotebook *nb, EphyTab *tab)
 	close_button = gtk_button_new ();
 	gtk_button_set_relief (GTK_BUTTON (close_button),
 			       GTK_RELIEF_NONE);
-	image = gtk_image_new_from_stock (GTK_STOCK_CLOSE,
-					  GTK_ICON_SIZE_MENU);
-	gtk_widget_set_size_request (close_button, w, h);
+	close_icon_size = gtk_icon_size_from_name (EPHY_ICON_SIZE_TAB_BUTTON);
+	image = gtk_image_new_from_stock (EPHY_STOCK_CLOSE_TAB, close_icon_size);
 	gtk_container_add (GTK_CONTAINER (close_button), image);
 	gtk_box_pack_start (GTK_BOX (hbox), close_button, FALSE, FALSE, 0);