aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--src/ephy-window.c15
-rw-r--r--src/ephy-window.h2
-rw-r--r--src/epiphany.defs6
-rw-r--r--src/window-commands.c17
5 files changed, 21 insertions, 30 deletions
diff --git a/ChangeLog b/ChangeLog
index 017861842..6dd85bf65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-06-08 Christian Persch <chpe@cvs.gnome.org>
+
+ * src/ephy-window.c:
+ * src/ephy-window.h:
+ * src/epiphany.defs:
+ * src/window-commands.c: (window_cmd_edit_select_all),
+ (window_cmd_edit_find):
+
+ Handle Ctrl-F like / to open the find bar without focusing it.
+ Fixes link activation while finding.
+
2005-06-07 Jean-François Rameau <jframeau@cvs.gnome.org>
* embed/mozilla/MozDownload.cpp: (file_is_compressed),
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 8d85d0db1..4404d90ec 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -3262,21 +3262,6 @@ ephy_window_notebook_switch_page_cb (GtkNotebook *notebook,
}
/**
- * ephy_window_find:
- * @window: an #EphyWindow
- *
- * Displays @window's Find dialog.
- **/
-void
-ephy_window_find (EphyWindow *window)
-{
- EphyWindowPrivate *priv = window->priv;
-
- ephy_find_toolbar_open (priv->find_toolbar, FALSE, FALSE);
- gtk_widget_grab_focus (GTK_WIDGET (priv->find_toolbar));
-}
-
-/**
* ephy_window_set_zoom:
* @window: an #EphyWindow
* @zoom: the desired zoom level
diff --git a/src/ephy-window.h b/src/ephy-window.h
index ba2d49ec5..8a58e9ea1 100644
--- a/src/ephy-window.h
+++ b/src/ephy-window.h
@@ -101,8 +101,6 @@ EphyEmbed *ephy_window_get_active_embed (EphyWindow *window);
GList *ephy_window_get_tabs (EphyWindow *window);
-void ephy_window_find (EphyWindow *window);
-
gboolean ephy_window_get_is_popup (EphyWindow *window);
gboolean ephy_window_get_is_print_preview(EphyWindow *window);
diff --git a/src/epiphany.defs b/src/epiphany.defs
index 2e1ade274..7917fe846 100644
--- a/src/epiphany.defs
+++ b/src/epiphany.defs
@@ -3016,12 +3016,6 @@
(return-type "GList*")
)
-(define-method find
- (of-object "EphyWindow")
- (c-name "ephy_window_find")
- (return-type "none")
-)
-
(define-method get_is_popup
(of-object "EphyWindow")
(c-name "ephy_window_get_is_popup")
diff --git a/src/window-commands.c b/src/window-commands.c
index 7f4893aab..7b197f9d8 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -60,13 +60,6 @@
#include <glib/gi18n.h>
void
-window_cmd_edit_find (GtkAction *action,
- EphyWindow *window)
-{
- ephy_window_find (window);
-}
-
-void
window_cmd_file_print_setup (GtkAction *action,
EphyWindow *window)
{
@@ -557,6 +550,16 @@ window_cmd_edit_select_all (GtkAction *action,
}
void
+window_cmd_edit_find (GtkAction *action,
+ EphyWindow *window)
+{
+ EphyFindToolbar *toolbar;
+
+ toolbar = EPHY_FIND_TOOLBAR (ephy_window_get_find_toolbar (window));
+ ephy_find_toolbar_open (toolbar, FALSE, FALSE);
+}
+
+void
window_cmd_edit_find_next (GtkAction *action,
EphyWindow *window)
{