aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-05-11 20:59:07 +0800
committerChristian Persch <chpe@src.gnome.org>2006-05-11 20:59:07 +0800
commit16ba41cf94ecd37d5064dabd14a54da93485166f (patch)
treea2648a8f559e1b63247764d4bf7a26e9f9bc6dfa
parent052a49748cb4864db8d4b04c565eb158d084da1d (diff)
downloadgsoc2013-epiphany-16ba41cf94ecd37d5064dabd14a54da93485166f.tar
gsoc2013-epiphany-16ba41cf94ecd37d5064dabd14a54da93485166f.tar.gz
gsoc2013-epiphany-16ba41cf94ecd37d5064dabd14a54da93485166f.tar.bz2
gsoc2013-epiphany-16ba41cf94ecd37d5064dabd14a54da93485166f.tar.lz
gsoc2013-epiphany-16ba41cf94ecd37d5064dabd14a54da93485166f.tar.xz
gsoc2013-epiphany-16ba41cf94ecd37d5064dabd14a54da93485166f.tar.zst
gsoc2013-epiphany-16ba41cf94ecd37d5064dabd14a54da93485166f.zip
Remove HAVE_TYPEAHEADFIND ifdefs, since we now always have that. Fixes the
2006-05-11 Christian Persch <chpe@cvs.gnome.org> * src/ephy-find-toolbar.c: (entry_changed_cb), (ephy_find_toolbar_set_embed): Remove HAVE_TYPEAHEADFIND ifdefs, since we now always have that. Fixes the find bar after the drop of gecko 1.7/non-toolkit.
-rw-r--r--ChangeLog8
-rw-r--r--src/ephy-find-toolbar.c10
2 files changed, 8 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 61b4750c7..b14b0397a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2006-05-11 Christian Persch <chpe@cvs.gnome.org>
+ * src/ephy-find-toolbar.c: (entry_changed_cb),
+ (ephy_find_toolbar_set_embed):
+
+ Remove HAVE_TYPEAHEADFIND ifdefs, since we now always have that.
+ Fixes the find bar after the drop of gecko 1.7/non-toolkit.
+
+2006-05-11 Christian Persch <chpe@cvs.gnome.org>
+
* src/ephy-notebook.c:
And revert it since it causes a gtk warning.
diff --git a/src/ephy-find-toolbar.c b/src/ephy-find-toolbar.c
index 32bad37ef..d91df26ef 100644
--- a/src/ephy-find-toolbar.c
+++ b/src/ephy-find-toolbar.c
@@ -140,8 +140,6 @@ clear_status (EphyFindToolbar *toolbar)
priv->links_only ? _("Find links:") : _("Find:"));
}
-#ifdef HAVE_TYPEAHEADFIND
-
/* Code adapted from gtktreeview.c:gtk_tree_view_key_press() and
* gtk_tree_view_real_start_interactive_seach()
*/
@@ -176,8 +174,6 @@ tab_search_key_press_cb (EphyEmbed *embed,
return FALSE;
}
-#endif /* HAVE_TYPEAHEADFIND */
-
static void
find_next_cb (EphyFindToolbar *toolbar)
{
@@ -197,9 +193,7 @@ entry_changed_cb (GtkEntry *entry,
EphyFindToolbarPrivate *priv = toolbar->priv;
const char *text;
char *lowercase;
-#ifdef HAVE_TYPEAHEADFIND
EphyEmbedFindResult result;
-#endif
gboolean case_sensitive;
text = gtk_entry_get_text (GTK_ENTRY (priv->entry));
@@ -212,11 +206,9 @@ entry_changed_cb (GtkEntry *entry,
g_free (lowercase);
ephy_embed_find_set_properties (get_find (toolbar), text, case_sensitive);
-#ifdef HAVE_TYPEAHEADFIND
result = ephy_embed_find_find (get_find (toolbar), text, priv->links_only);
set_status (toolbar, result);
-#endif
}
static gboolean
@@ -581,11 +573,9 @@ ephy_find_toolbar_set_embed (EphyFindToolbar *toolbar,
{
clear_status (toolbar);
-#ifdef HAVE_TYPEAHEADFIND
g_signal_connect_object (embed, "ge-search-key-press",
G_CALLBACK (tab_search_key_press_cb),
toolbar, 0);
-#endif /* HAVE_TYPEAHEADFIND */
if (priv->find != NULL)
{