diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2006-01-04 20:27:19 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2006-01-04 20:27:19 +0800 |
| commit | 025a5dc6194486df6da17a5b63427ba055f1be53 (patch) | |
| tree | 81b1004340b3fc4f026ee9dea354500c6728f181 /src | |
| parent | 306662611e5e0506aba2955385f46a3b75ca3dcb (diff) | |
| download | gsoc2013-epiphany-025a5dc6194486df6da17a5b63427ba055f1be53.tar gsoc2013-epiphany-025a5dc6194486df6da17a5b63427ba055f1be53.tar.gz gsoc2013-epiphany-025a5dc6194486df6da17a5b63427ba055f1be53.tar.bz2 gsoc2013-epiphany-025a5dc6194486df6da17a5b63427ba055f1be53.tar.lz gsoc2013-epiphany-025a5dc6194486df6da17a5b63427ba055f1be53.tar.xz gsoc2013-epiphany-025a5dc6194486df6da17a5b63427ba055f1be53.tar.zst gsoc2013-epiphany-025a5dc6194486df6da17a5b63427ba055f1be53.zip | |
Fix warning when Ctrl-F while the find toolbar is already shown.
2006-01-04 Christian Persch <chpe@cvs.gnome.org>
* src/ephy-find-toolbar.c: (set_focus_cb),
(ephy_find_toolbar_grab_focus), (ephy_find_toolbar_open),
(ephy_find_toolbar_close):
Fix warning when Ctrl-F while the find toolbar is already shown.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ephy-find-toolbar.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/ephy-find-toolbar.c b/src/ephy-find-toolbar.c index b827ad574..37ffe19a7 100644 --- a/src/ephy-find-toolbar.c +++ b/src/ephy-find-toolbar.c @@ -54,7 +54,6 @@ struct _EphyFindToolbarPrivate guint preedit_changed : 1; guint prevent_activate : 1; guint activated : 1; - guint explicit_focus : 1; guint links_only : 1; guint typing_ahead : 1; }; @@ -245,11 +244,7 @@ set_focus_cb (EphyWindow *window, } /* if widget == toolbar, the new focus widget is in the toolbar */ - if (widget == wtoolbar) - { - priv->explicit_focus = TRUE; - } - else if (priv->explicit_focus) + if (widget != wtoolbar) { ephy_find_toolbar_request_close (toolbar); } @@ -288,7 +283,6 @@ ephy_find_toolbar_grab_focus (GtkWidget *widget) EphyFindToolbarPrivate *priv = toolbar->priv; gtk_widget_grab_focus (GTK_WIDGET (priv->entry)); - g_return_if_fail (priv->explicit_focus); } static void @@ -571,7 +565,6 @@ ephy_find_toolbar_open (EphyFindToolbar *toolbar, priv->typing_ahead = typing_ahead; priv->links_only = links_only; - priv->explicit_focus = FALSE; if (clear_search) { @@ -592,9 +585,6 @@ ephy_find_toolbar_close (EphyFindToolbar *toolbar) { EphyFindToolbarPrivate *priv = toolbar->priv; - /* first unset explicit_focus, else we get infinite recursion */ - priv->explicit_focus = FALSE; - gtk_widget_hide (GTK_WIDGET (toolbar)); } |