aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-05-29 22:53:55 +0800
committerChristian Persch <chpe@src.gnome.org>2005-05-29 22:53:55 +0800
commit2dfaf78cccff672362ae9f3bbf299da641851306 (patch)
tree4f8177d1dd9a41bbbba36de054c3ed1466a56747
parent5b39b99462ae5b868bc8aae688255197e850d036 (diff)
downloadgsoc2013-epiphany-2dfaf78cccff672362ae9f3bbf299da641851306.tar
gsoc2013-epiphany-2dfaf78cccff672362ae9f3bbf299da641851306.tar.gz
gsoc2013-epiphany-2dfaf78cccff672362ae9f3bbf299da641851306.tar.bz2
gsoc2013-epiphany-2dfaf78cccff672362ae9f3bbf299da641851306.tar.lz
gsoc2013-epiphany-2dfaf78cccff672362ae9f3bbf299da641851306.tar.xz
gsoc2013-epiphany-2dfaf78cccff672362ae9f3bbf299da641851306.tar.zst
gsoc2013-epiphany-2dfaf78cccff672362ae9f3bbf299da641851306.zip
Only enable typeahead if we actually can do typeaheadfind.
2005-05-29 Christian Persch <chpe@cvs.gnome.org> * src/ephy-find-toolbar.c: (ephy_find_toolbar_set_embed), (ephy_find_toolbar_open): Only enable typeahead if we actually can do typeaheadfind.
-rw-r--r--ChangeLog7
-rw-r--r--src/ephy-find-toolbar.c8
2 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b9e51601..0b6a49bb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2005-05-29 Christian Persch <chpe@cvs.gnome.org>
+ * src/ephy-find-toolbar.c: (ephy_find_toolbar_set_embed),
+ (ephy_find_toolbar_open):
+
+ Only enable typeahead if we actually can do typeaheadfind.
+
+2005-05-29 Christian Persch <chpe@cvs.gnome.org>
+
* src/ephy-window.c: (sync_tab_document_type):
Allow ViewSource for XML documents too. Fixes bug #305788.
diff --git a/src/ephy-find-toolbar.c b/src/ephy-find-toolbar.c
index c5f98f142..40cdeb702 100644
--- a/src/ephy-find-toolbar.c
+++ b/src/ephy-find-toolbar.c
@@ -114,6 +114,8 @@ tab_content_changed_cb (EphyEmbed *embed,
set_controls (toolbar, TRUE, TRUE);
}
+#ifdef HAVE_TYPEAHEADFIND
+
/* Cut and paste from gtkwindow.c */
static void
send_focus_change (GtkWidget *widget,
@@ -216,6 +218,8 @@ tab_dom_key_press_cb (EphyEmbed *embed,
return (retval && oldhash != newhash) || priv->preedit_changed;
}
+#endif /* HAVE_TYPEAHEADFIND */
+
static void
find_next_cb (EphyFindToolbar *toolbar)
{
@@ -530,9 +534,11 @@ ephy_find_toolbar_set_embed (EphyFindToolbar *toolbar,
g_signal_connect_object (embed, "ge-content-change",
G_CALLBACK (tab_content_changed_cb),
toolbar, G_CONNECT_AFTER);
+#ifdef HAVE_TYPEAHEADFIND
g_signal_connect_object (embed, "dom-key-press",
G_CALLBACK (tab_dom_key_press_cb),
toolbar, 0);
+#endif
if (priv->find != NULL)
{
@@ -577,7 +583,9 @@ ephy_find_toolbar_open (EphyFindToolbar *toolbar,
gtk_widget_show (GTK_WIDGET (toolbar));
ephy_embed_activate (priv->embed);
+#ifdef HAVE_TYPEAHEADFIND
send_focus_change (priv->entry, TRUE);
+#endif
}
void