aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--src/ephy-notebook.c13
2 files changed, 10 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index cd8e8891d..7cf8a8b0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-04 Christian Persch <chpe@cvs.gnome.org>
+
+ * src/ephy-notebook.c: (close_button_clicked_cb),
+ (build_tab_label):
+
+ Better fix for bug #119461, just use gtk_button_set_focus_on_click().
+ Thanks to tko for pointing this out to me.
+
2005-01-03 Adam Hooper <adamh@cvs.gnome.org>
* embed/ephy-embed.c: (ephy_embed_base_init):
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index fafce396e..893880f13 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -805,15 +805,6 @@ close_button_clicked_cb (GtkWidget *widget, GtkWidget *tab)
if (inhibited == FALSE)
{
- GtkNotebook *gnotebook;
- GtkWidget *active_tab;
-
- gnotebook = GTK_NOTEBOOK (notebook);
- active_tab = gtk_notebook_get_nth_page
- (gnotebook, gtk_notebook_get_current_page (gnotebook));
- /* focus the active tab, bug #119461 */
- gtk_widget_grab_focus (active_tab);
-
ephy_notebook_remove_tab (notebook, EPHY_TAB (tab));
}
}
@@ -868,8 +859,8 @@ build_tab_label (EphyNotebook *nb, EphyTab *tab)
gtk_button_set_relief (GTK_BUTTON (close_button),
GTK_RELIEF_NONE);
/* don't allow focus on the close button */
- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_FOCUS);
- GTK_WIDGET_SET_FLAGS (close_button, GTK_CAN_DEFAULT);
+ gtk_button_set_focus_on_click (GTK_BUTTON (close_button), FALSE);
+
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);