diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-12-08 02:15:33 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-12-08 02:15:33 +0800 |
| commit | 71b468b05580953e70aabce5b68586ed8967c71c (patch) | |
| tree | e20cf2a7889bd3555d7466a6543565c3969d5e85 /src | |
| parent | c92bf4456143bc5e230bd0153d4bc938b68fddfc (diff) | |
| download | gsoc2013-epiphany-71b468b05580953e70aabce5b68586ed8967c71c.tar.gz gsoc2013-epiphany-71b468b05580953e70aabce5b68586ed8967c71c.tar.zst gsoc2013-epiphany-71b468b05580953e70aabce5b68586ed8967c71c.zip | |
Minor code cleanup.
2005-12-07 Christian Persch <chpe@cvs.gnome.org>
* embed/mozilla/EphyFind.cpp:
Minor code cleanup.
* src/ephy-find-toolbar.c: (entry_key_press_event_cb),
(ephy_find_toolbar_close):
Also check for GDK_ISO_Enter.
* src/ephy-window.c: (sync_tab_address):
Close the find toolbar when loading a new page.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ephy-find-toolbar.c | 6 | ||||
| -rw-r--r-- | src/ephy-window.c | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/ephy-find-toolbar.c b/src/ephy-find-toolbar.c index f1632bfe8..d20aa8a2c 100644 --- a/src/ephy-find-toolbar.c +++ b/src/ephy-find-toolbar.c @@ -278,7 +278,9 @@ entry_key_press_event_cb (GtkEntry *entry, } } else if ((event->state & mask) == GDK_CONTROL_MASK && - (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter)) + (event->keyval == GDK_Return || + event->keyval == GDK_KP_Enter || + event->keyval == GDK_ISO_Enter)) { handled = ephy_embed_find_activate_link (get_find (toolbar), event->state); } @@ -690,7 +692,7 @@ ephy_find_toolbar_close (EphyFindToolbar *toolbar) gtk_widget_hide (GTK_WIDGET (toolbar)); - if (priv->embed == NULL) return; + if (priv->embed == NULL || priv->find == NULL) return; ephy_embed_find_set_selection (get_find (toolbar), FALSE); } diff --git a/src/ephy-window.c b/src/ephy-window.c index 6f64ff023..87cb491f8 100644 --- a/src/ephy-window.c +++ b/src/ephy-window.c @@ -1300,13 +1300,18 @@ setup_ui_manager (EphyWindow *window) } static void -sync_tab_address (EphyTab *tab, GParamSpec *pspec, EphyWindow *window) +sync_tab_address (EphyTab *tab, + GParamSpec *pspec, + EphyWindow *window) { - if (window->priv->closing) return; + EphyWindowPrivate *priv = window->priv; + + if (priv->closing) return; - ephy_toolbar_set_location (window->priv->toolbar, + ephy_toolbar_set_location (priv->toolbar, ephy_tab_get_address (tab), ephy_tab_get_typed_address (tab)); + ephy_find_toolbar_request_close (priv->find_toolbar); } static void |