aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--data/Makefile.am2
-rw-r--r--data/default-prefs-gecko-1-8.js6
3 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e8ce80f8..1c28abee1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2005-07-17 Christian Persch <chpe@cvs.gnome.org>
+ * data/Makefile.am:
+
+ Use $^ in the default-prefs.js rule.
+
+ * data/default-prefs-gecko-1.8.js:
+
+ All these are already set by default, no need to repeat them.
+
+2005-07-17 Christian Persch <chpe@cvs.gnome.org>
+
* src/bookmarks/ephy-bookmark-action.c:
(ephy_bookmark_action_sync_smart_url):
* src/bookmarks/ephy-bookmarks.c: (resolve_cb), (browse_cb),
diff --git a/data/Makefile.am b/data/Makefile.am
index ecbd4f932..58481cee0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -20,7 +20,7 @@ default_prefs_files += default-prefs-gecko-1-8.js
endif
default-prefs.js: $(default_prefs_files)
- (cd $(srcdir) && cat $(default_prefs_files) ) > $@
+ cat $^ > $@
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
index 8ae10f00b..e69de29bb 100644
--- a/data/default-prefs-gecko-1-8.js
+++ b/data/default-prefs-gecko-1-8.js
@@ -1,6 +0,0 @@
-// enable error pages
-pref("browser.xul.error_pages.enabled", true);
-pref("browser.xul.error_pages.location", "epiphany:error");
-
-// use fast-back
-//pref("browser.sessionhistory.max_viewers", 3);