aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/ephy-find-toolbar.c23
2 files changed, 19 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 6149579e3..d02658d84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-05-29 Christian Persch <chpe@cvs.gnome.org>
+ * src/ephy-find-toolbar.c: (tab_dom_key_press_cb):
+
+ Don't special-case ' and / if the find bar is already active.
+
+2005-05-29 Christian Persch <chpe@cvs.gnome.org>
+
* src/ephy-find-toolbar.c: (tab_dom_key_press_cb),
(entry_activate_cb), (sync_print_preview_mode),
(ephy_find_toolbar_set_window), (ephy_find_toolbar_get_property),
diff --git a/src/ephy-find-toolbar.c b/src/ephy-find-toolbar.c
index 75740c04c..cad443aec 100644
--- a/src/ephy-find-toolbar.c
+++ b/src/ephy-find-toolbar.c
@@ -178,17 +178,20 @@ tab_dom_key_press_cb (EphyEmbed *embed,
event_key = (GdkEventKey *) event;
/* check for / and ' which open the find toolbar in text resp. link mode */
- if (event_key->keyval == GDK_slash)
+ if (GTK_WIDGET_VISIBLE (widget) == FALSE)
{
- ephy_find_toolbar_open (toolbar, FALSE);
- gdk_event_free (event);
- return TRUE;
- }
- else if (event_key->keyval == GDK_apostrophe)
- {
- ephy_find_toolbar_open (toolbar, TRUE);
- gdk_event_free (event);
- return TRUE;
+ if (event_key->keyval == GDK_slash)
+ {
+ ephy_find_toolbar_open (toolbar, FALSE);
+ gdk_event_free (event);
+ return TRUE;
+ }
+ else if (event_key->keyval == GDK_apostrophe)
+ {
+ ephy_find_toolbar_open (toolbar, TRUE);
+ gdk_event_free (event);
+ return TRUE;
+ }
}
/* don't do anything if the find toolbar is hidden */