diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | data/Makefile.am | 13 | ||||
| -rw-r--r-- | data/default-prefs-common.js (renamed from data/default-prefs.js) | 3 | ||||
| -rw-r--r-- | data/default-prefs-mozilla.js | 0 | ||||
| -rw-r--r-- | data/default-prefs-toolkit.js | 6 |
6 files changed, 41 insertions, 4 deletions
@@ -1,3 +1,15 @@ +2004-09-28 Christian Persch <chpe@cvs.gnome.org> + + * configure.ac: + * 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> * lib/egg/Makefile.am: diff --git a/configure.ac b/configure.ac index 100c20965..6b6d6072b 100644 --- a/configure.ac +++ b/configure.ac @@ -152,14 +152,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 f4df83595..8831088e1 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 @@ -53,6 +62,7 @@ EXTRA_DIST = \ $(mimepermission_DATA) \ $(extensionschema_DATA) \ $(pkgconfig_DATA) \ + $(default_prefs_in_FILES) \ check-mime.py DISTCLEANFILES = \ @@ -60,4 +70,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); + |