aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--data/default-prefs-common.js4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2f14bcf98..16f51dfe1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-27 Christian Persch <chpe@cvs.gnome.org>
+
+ * data/default-prefs-common.js:
+
+ Back out the fix for bug #158486 by re-enabling keyword:
+ searches. Fixes bug #314974.
+
2005-09-26 Christian Persch <chpe@cvs.gnome.org>
* src/ephy-notebook.c: (tab_label_style_set_cb),
diff --git a/data/default-prefs-common.js b/data/default-prefs-common.js
index 6801a0b15..02746bfb8 100644
--- a/data/default-prefs-common.js
+++ b/data/default-prefs-common.js
@@ -33,8 +33,8 @@ pref("helpers.private_mailcap_file", "");
pref("helpers.global_mime_types_file", "");
pref("helpers.private_mime_types_file", "");
-// disable keyword searches by default, see bug #158486
-pref("keyword.enabled", false);
+// enable keyword search
+pref("keyword.enabled", true);
// disable usless security warnings
pref("security.warn_entering_secure", false);