aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--src/ephy-find-toolbar.c7
2 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fc94f3705..734bfb83b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2005-07-09 Christian Persch <chpe@cvs.gnome.org>
+ * src/ephy-find-toolbar.c: (ephy_find_toolbar_close):
+
+ Don't focus the embed on close on !typeaheadfind,
+ since it's a crash. Fixes bug #307675.
+
+2005-07-09 Christian Persch <chpe@cvs.gnome.org>
+
* embed/mozilla/EphyProtocolHandler.cpp:
Make error page nicer; code by Adam Hooper.
diff --git a/src/ephy-find-toolbar.c b/src/ephy-find-toolbar.c
index 0805c31d2..84ce8ed4d 100644
--- a/src/ephy-find-toolbar.c
+++ b/src/ephy-find-toolbar.c
@@ -663,10 +663,13 @@ ephy_find_toolbar_open (EphyFindToolbar *toolbar,
}
gtk_widget_show (GTK_WIDGET (toolbar));
- ephy_embed_activate (priv->embed);
#ifdef HAVE_TYPEAHEADFIND
+ ephy_embed_activate (priv->embed);
+
send_focus_change (priv->entry, TRUE);
+#else
+ gtk_widget_grab_focus (GTK_WIDGET (toolbar));
#endif
}
@@ -681,5 +684,7 @@ 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);
+#endif
}