From 7274cb593c20c9bc973673c0767693c9cf3023bb Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sat, 9 Jul 2005 15:57:16 +0000 Subject: Don't focus the embed on close on !typeaheadfind, since it's a crash. 2005-07-09 Christian Persch * 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. --- ChangeLog | 7 +++++++ src/ephy-find-toolbar.c | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index fc94f3705..734bfb83b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-07-09 Christian Persch + + * 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 * embed/mozilla/EphyProtocolHandler.cpp: 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 } -- cgit v1.2.3