aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--data/Makefile.am15
-rw-r--r--data/default-prefs-gecko-1-8.js2
3 files changed, 21 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c455069d5..3f2da5764 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-24 Christian Persch <chpe@cvs.gnome.org>
+
+ * data/Makefile.am:
+ * data/default-prefs-gecko-1-8.js:
+
+ Enable error pages on Gecko 1.8.
+
2005-05-23 Jean-François Rameau <jframeau@cvs.gnome.org>
* src/ephy-shell.c: (ephy_shell_new_window_cb):
diff --git a/data/Makefile.am b/data/Makefile.am
index b31975a72..ecbd4f932 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -8,10 +8,19 @@ SUBDIRS = ui art glade
default_prefs_in_FILES = \
default-prefs-common.js \
default-prefs-mozilla.js \
- default-prefs-toolkit.js
+ default-prefs-toolkit.js \
+ default-prefs-gecko-1-8.js
-default-prefs.js: $(default_prefs_in_FILES)
- cat $(srcdir)/default-prefs-common.js $(srcdir)/default-prefs-$(MOZILLA_FLAVOUR).js > $(top_builddir)/$(subdir)/default-prefs.js
+default_prefs_files = \
+ default-prefs-common.js \
+ default-prefs-$(MOZILLA_FLAVOUR).js
+
+if HAVE_GECKO_1_8
+default_prefs_files += default-prefs-gecko-1-8.js
+endif
+
+default-prefs.js: $(default_prefs_files)
+ (cd $(srcdir) && cat $(default_prefs_files) ) > $@
default_prefsdir = $(pkgdatadir)
default_prefs_DATA = default-prefs.js
diff --git a/data/default-prefs-gecko-1-8.js b/data/default-prefs-gecko-1-8.js
new file mode 100644
index 000000000..436172742
--- /dev/null
+++ b/data/default-prefs-gecko-1-8.js
@@ -0,0 +1,2 @@
+// enable error pages
+pref("browser.xul.error_pages.enabled", true);