summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-09-28 12:50:26 +0000
committerChristian Persch <chpe@src.gnome.org>2004-09-28 12:50:26 +0000
commit8fd35fb4374ab1d63098c8a4a057af6f3dfaa7b9 (patch)
tree747a19946e1e9c16f85b1d606cadc3a7db4e63a2
parent2529a2fd46460294395c8c3131b9c9bf8dcb4196 (diff)
downloadepiphany-8fd35fb4374ab1d63098c8a4a057af6f3dfaa7b9.tar.gz
A data/default-prefs-common.js: A data/default-prefs-mozilla.js: A
2004-09-28 Christian Persch <chpe@cvs.gnome.org> * configure.in: * data/Makefile.am: A data/default-prefs-common.js: A data/default-prefs-mozilla.js: A data/default-prefs-toolkit.js: R data/default-prefs.js: Split the default prefs into the common part, and mozilla/new toolkit specific parts.
-rw-r--r--ChangeLog12
-rw-r--r--configure.in11
-rw-r--r--data/Makefile.am13
-rw-r--r--data/default-prefs-common.js (renamed from data/default-prefs.js)3
-rw-r--r--data/default-prefs-mozilla.js0
-rw-r--r--data/default-prefs-toolkit.js6
6 files changed, 41 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 97c882ae5..d57dba3c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-09-28 Christian Persch <chpe@cvs.gnome.org>
+
+ * configure.in:
+ * data/Makefile.am:
+ A data/default-prefs-common.js:
+ A data/default-prefs-mozilla.js:
+ A data/default-prefs-toolkit.js:
+ R data/default-prefs.js:
+
+ Split the default prefs into the common part, and mozilla/new toolkit
+ specific parts.
+
2004-09-27 Christian Persch <chpe@cvs.gnome.org>
* src/bookmarks/ephy-bookmark-action.c: (remove_from_model),
diff --git a/configure.in b/configure.in
index cb1492d91..881e08e1a 100644
--- a/configure.in
+++ b/configure.in
@@ -135,14 +135,19 @@ elif test "x$with_mozilla" != "xmozilla" -a "x$with_mozilla" != "xfirefox" -a "x
AC_MSG_ERROR([unknown mozilla name ($MOZILLA)])
fi
+AC_SUBST(MOZILLA)
+
AC_MSG_RESULT([$MOZILLA])
case "$MOZILLA" in
-mozilla) min_version=1.7 ;;
-firefox) min_version=0.10 ;;
-thunderbird) min_version=0.8 ;;
+mozilla) min_version=1.7 flavour=mozilla ;;
+firefox) min_version=0.10 flavour=toolkit ;;
+thunderbird) min_version=0.8 flavour=toolkit ;;
esac
+MOZILLA_FLAVOUR=$flavour
+AC_SUBST(MOZILLA_FLAVOUR)
+
PKG_CHECK_MODULES(MOZILLA_COMPONENT, $MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version)
AC_SUBST(MOZILLA_COMPONENT_CFLAGS)
AC_SUBST(MOZILLA_COMPONENT_LIBS)
diff --git a/data/Makefile.am b/data/Makefile.am
index f7c94e813..89f225945 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,7 +4,16 @@ SUBDIRS = ui art glade
@INTLTOOL_DESKTOP_RULE@
@INTLTOOL_SCHEMAS_RULE@
-dist_pkgdata_DATA = default-prefs.js
+default_prefs_in_FILES = \
+ default-prefs-common.js \
+ default-prefs-mozilla.js \
+ default-prefs-toolkit.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_prefsdir = $(pkgdatadir)
+default_prefs_DATA = default-prefs.js
server_in_files = GNOME_Epiphany_Automation.server.in
server_DATA = GNOME_Epiphany_Automation.server
@@ -49,6 +58,7 @@ EXTRA_DIST = \
$(applications_DATA) \
$(mimepermission_DATA) \
$(pkgconfig_DATA) \
+ $(default_prefs_in_FILES) \
check-mime.py
DISTCLEANFILES = \
@@ -56,4 +66,5 @@ DISTCLEANFILES = \
$(Applications_DATA) \
$(schema_DATA) \
$(pkgconfig_DATA) \
+ $(default_prefs_DATA) \
$(DESKTOP_FILES)
diff --git a/data/default-prefs.js b/data/default-prefs-common.js
index ee659f03a..3586f757f 100644
--- a/data/default-prefs.js
+++ b/data/default-prefs-common.js
@@ -85,3 +85,6 @@ pref("network.protocol-handler.external.webcal", true);
// disable xpinstall
pref("xpinstall.enabled", false);
+// enable typeahead find
+pref("accessibility.typeaheadfind", true);
+
diff --git a/data/default-prefs-mozilla.js b/data/default-prefs-mozilla.js
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/default-prefs-mozilla.js
diff --git a/data/default-prefs-toolkit.js b/data/default-prefs-toolkit.js
new file mode 100644
index 000000000..b1a1db7e0
--- /dev/null
+++ b/data/default-prefs-toolkit.js
@@ -0,0 +1,6 @@
+// enable plugin finder
+pref("plugin.default_plugin_disabled", true);
+
+// enable locale matching
+pref("intl.locale.matchOS", true);
+