aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-08-16 06:52:51 +0800
committerChristian Persch <chpe@src.gnome.org>2005-08-16 06:52:51 +0800
commit724f973eb43d9527f199fcf3491876adada02711 (patch)
treec8a002b7d75308d4ca659521e6d79bcabc40f324
parent18cb6c805fc57c21b173725e3a334a135e32e16e (diff)
downloadgsoc2013-epiphany-724f973eb43d9527f199fcf3491876adada02711.tar
gsoc2013-epiphany-724f973eb43d9527f199fcf3491876adada02711.tar.gz
gsoc2013-epiphany-724f973eb43d9527f199fcf3491876adada02711.tar.bz2
gsoc2013-epiphany-724f973eb43d9527f199fcf3491876adada02711.tar.lz
gsoc2013-epiphany-724f973eb43d9527f199fcf3491876adada02711.tar.xz
gsoc2013-epiphany-724f973eb43d9527f199fcf3491876adada02711.tar.zst
gsoc2013-epiphany-724f973eb43d9527f199fcf3491876adada02711.zip
Only activate link in typeahead mode, not in Ctrl-F find mode.
2005-08-16 Christian Persch <chpe@cvs.gnome.org> * src/ephy-find-toolbar.c: (entry_activate_cb), (ephy_find_toolbar_open): Only activate link in typeahead mode, not in Ctrl-F find mode.
-rw-r--r--ChangeLog7
-rw-r--r--src/ephy-find-toolbar.c21
2 files changed, 26 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 437af83d4..d7622d007 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2005-08-16 Christian Persch <chpe@cvs.gnome.org>
+ * src/ephy-find-toolbar.c: (entry_activate_cb),
+ (ephy_find_toolbar_open):
+
+ Only activate link in typeahead mode, not in Ctrl-F find mode.
+
+2005-08-16 Christian Persch <chpe@cvs.gnome.org>
+
* embed/mozilla/EphyFind.cpp:
Return TRUE if the event was consumed.
diff --git a/src/ephy-find-toolbar.c b/src/ephy-find-toolbar.c
index ac435ebf4..011121512 100644
--- a/src/ephy-find-toolbar.c
+++ b/src/ephy-find-toolbar.c
@@ -58,6 +58,7 @@ struct _EphyFindToolbarPrivate
guint activated : 1;
guint explicit_focus : 1;
guint links_only : 1;
+ guint typing_ahead : 1;
};
enum
@@ -320,7 +321,21 @@ static void
entry_activate_cb (GtkWidget *entry,
EphyFindToolbar *toolbar)
{
- ephy_embed_find_activate_link (get_find (toolbar), 0);
+ EphyFindToolbarPrivate *priv = toolbar->priv;
+
+#ifdef FIND_WHILE_TYPING_IN_EMBED
+ priv->activated = TRUE;
+ if (priv->prevent_activate) return;
+#endif
+
+ if (priv->typing_ahead)
+ {
+ ephy_embed_find_activate_link (get_find (toolbar), 0);
+ }
+ else
+ {
+ g_signal_emit (toolbar, signals[NEXT], 0);
+ }
}
static void
@@ -678,12 +693,14 @@ ephy_find_toolbar_find_previous (EphyFindToolbar *toolbar)
void
ephy_find_toolbar_open (EphyFindToolbar *toolbar,
gboolean links_only,
- gboolean clear_search)
+ gboolean typing_ahead)
{
EphyFindToolbarPrivate *priv = toolbar->priv;
+ gboolean clear_search = !typing_ahead;
g_return_if_fail (priv->embed != NULL);
+ priv->typing_ahead = typing_ahead;
priv->links_only = links_only;
priv->explicit_focus = FALSE;