Replace ephy_embed_activate with gtk_widget_grab_focus

2005-07-29  Crispin Flowerday	<gnome@flowerday.cx>

	* src/ephy-find-toolbar.c: (ephy_find_toolbar_grab_focus),
	(ephy_find_toolbar_open), (ephy_find_toolbar_close):
	* src/ephy-shell.c: (ephy_shell_new_tab_full):
	* src/ephy-tab.c: (ephy_tab_grab_focus):
	* src/ephy-window.c: (ephy_window_key_press_event),
	(ephy_window_open_link):
	* src/window-commands.c: (window_cmd_go_back), (window_cmd_go_up),
	(window_cmd_go_forward), (window_cmd_view_stop),
	(window_cmd_view_reload):

	Replace ephy_embed_activate with gtk_widget_grab_focus

6 files changed, 26 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 767fe8ff0..e88391f49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-07-29  Crispin Flowerday	<gnome@flowerday.cx>
+
+	* src/ephy-find-toolbar.c: (ephy_find_toolbar_grab_focus),
+	(ephy_find_toolbar_open), (ephy_find_toolbar_close):
+	* src/ephy-shell.c: (ephy_shell_new_tab_full):
+	* src/ephy-tab.c: (ephy_tab_grab_focus):
+	* src/ephy-window.c: (ephy_window_key_press_event),
+	(ephy_window_open_link):
+	* src/window-commands.c: (window_cmd_go_back), (window_cmd_go_up),
+	(window_cmd_go_forward), (window_cmd_view_stop),
+	(window_cmd_view_reload):
+
+	Replace ephy_embed_activate with gtk_widget_grab_focus
+
 2005-07-29  Christian Persch  <chpe@cvs.gnome.org>
 
 	* src/ephy-statusbar.c: (ephy_statusbar_get_tooltips),
diff --git a/src/ephy-find-toolbar.c b/src/ephy-find-toolbar.c
index 851041fba..173deb095 100644
--- a/src/ephy-find-toolbar.c
+++ b/src/ephy-find-toolbar.c
@@ -376,7 +376,7 @@ ephy_find_toolbar_grab_focus (GtkWidget *widget)
 	EphyFindToolbar *toolbar = EPHY_FIND_TOOLBAR (widget);
 	EphyFindToolbarPrivate *priv = toolbar->priv;
 
-	gtk_widget_grab_focus (priv->entry);
+	gtk_widget_grab_focus (GTK_WIDGET (priv->entry));
 	g_return_if_fail (priv->explicit_focus);
 }
 
@@ -673,7 +673,7 @@ ephy_find_toolbar_open (EphyFindToolbar *toolbar,
 	gtk_widget_show (GTK_WIDGET (toolbar));
 
 #ifdef HAVE_TYPEAHEADFIND
-	ephy_embed_activate (priv->embed);
+	gtk_widget_grab_focus (GTK_WIDGET (priv->embed));
 
 	send_focus_change (priv->entry, TRUE);
 #else
@@ -693,6 +693,6 @@ ephy_find_toolbar_close (EphyFindToolbar *toolbar)
 	/* first unset explicit_focus, else we get infinite recursion */
 	priv->explicit_focus = FALSE;
 #ifndef HAVE_TYPEAHEADFIND
-	ephy_embed_activate (priv->embed);
+	gtk_widget_grab_focus (GTK_WIDGET (priv->embed));
 #endif
 }
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 5d9aaed4a..9dec961e9 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -795,7 +795,7 @@ ephy_shell_new_tab_full (EphyShell *shell,
                 {
 			/* non-empty page, focus the page. but make sure the widget is realised first! */
 			gtk_widget_realize (GTK_WIDGET (embed));
-			ephy_embed_activate (embed);
+			gtk_widget_grab_focus (GTK_WIDGET (embed));
                 }
         }
 
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index 8c244f6cc..e22b51e90 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -348,7 +348,7 @@ ephy_tab_grab_focus (GtkWidget *widget)
 {
 	EphyTab *tab = EPHY_TAB (widget);
 
-	ephy_embed_activate (ephy_tab_get_embed (tab));
+	gtk_widget_grab_focus (GTK_WIDGET (ephy_tab_get_embed (tab)));
 }
 
 static EphyWindow *
diff --git a/src/ephy-window.c b/src/ephy-window.c
index f2c374d60..67f017617 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -727,7 +727,7 @@ ephy_window_key_press_event (GtkWidget *widget,
 		embed = ephy_window_get_active_embed (window);
 		if (handled == FALSE && embed != NULL)
 		{
-			ephy_embed_activate (embed);
+			gtk_widget_grab_focus (GTK_WIDGET (embed));
 			ephy_embed_stop_load (embed);
 
 			handled = TRUE;
@@ -2705,7 +2705,7 @@ ephy_window_open_link (EphyLink *link,
 		}
 		else
 		{
-			ephy_embed_activate (embed);
+			gtk_widget_grab_focus (GTK_WIDGET (embed));
 		}
 
 		new_tab = tab;
diff --git a/src/window-commands.c b/src/window-commands.c
index 7b197f9d8..1203e536a 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -104,7 +104,7 @@ window_cmd_go_back (GtkAction *action,
 	embed = ephy_window_get_active_embed (window);
 	g_return_if_fail (embed != NULL);
 
-	ephy_embed_activate (embed);
+	gtk_widget_grab_focus (GTK_WIDGET (embed));
 
 	ephy_embed_go_back (embed);
 }
@@ -118,7 +118,7 @@ window_cmd_go_up (GtkAction *action,
 	embed = ephy_window_get_active_embed (window);
 	g_return_if_fail (embed != NULL);
 
-	ephy_embed_activate (embed);
+	gtk_widget_grab_focus (GTK_WIDGET (embed));
 
 	ephy_embed_go_up (embed);
 }
@@ -176,7 +176,7 @@ window_cmd_go_forward (GtkAction *action,
 	embed = ephy_window_get_active_embed (window);
 	g_return_if_fail (embed != NULL);
 
-	ephy_embed_activate (embed);
+	gtk_widget_grab_focus (GTK_WIDGET (embed));
 
 	ephy_embed_go_forward (embed);
 }
@@ -197,7 +197,7 @@ window_cmd_view_stop (GtkAction *action,
 	embed = ephy_window_get_active_embed (window);
 	g_return_if_fail (embed != NULL);
 
-	ephy_embed_activate (embed);
+	gtk_widget_grab_focus (GTK_WIDGET (embed));
 
 	ephy_embed_stop_load (embed);
 }
@@ -237,7 +237,7 @@ window_cmd_view_reload (GtkAction *action,
 		force = TRUE;
 	}
 
-	ephy_embed_activate (embed);
+	gtk_widget_grab_focus (GTK_WIDGET (embed));
 
 	ephy_embed_reload (embed, force);
 }