#! /bin/sh /usr/share/dpatch/dpatch-run
## 82_prefs.dpatch by Mike Hommey <glandium@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix font defaults.
## DP: Set javascript.options.showInConsole.
## DP: Set filename for general config file for locks and set the obscure
## DP: value to 0 so that the file needs not be "encrypted".
## DP: Workaround for freeze error with mail compose window after a couple
## DP: of hours of use. bz#307672
@DPATCH@
--- iceape/modules/libpref/src/init/all.js (revision 67)
+++ iceape/modules/libpref/src/init/all.js (local)
@@ -52,7 +52,8 @@
pref("general.useragent.locale", "chrome://navigator/locale/navigator.properties");
pref("general.useragent.contentlocale", "chrome://navigator-region/locale/region.properties");
-pref("general.config.obscure_value", 13); // for MCD .cfg files
+pref("general.config.obscure_value", 0); // for MCD .cfg files
+pref("general.config.filename", "iceape.cfg");
pref("browser.cache.disk.enable", true);
pref("browser.cache.disk.capacity", 51200);
@@ -439,6 +440,7 @@
pref("javascript.enabled", true);
pref("javascript.allow.mailnews", false);
pref("javascript.options.strict", false);
+pref("javascript.options.showInConsole", true);
// advanced prefs
pref("security.enable_java", true);
@@ -1872,33 +1874,33 @@
// th
-pref("font.name.serif.tr", "Times");
-pref("font.name.sans-serif.tr", "Helvetica");
-pref("font.name.monospace.tr", "Courier");
+pref("font.name.serif.tr", "serif");
+pref("font.name.sans-serif.tr", "sans-serif");
+pref("font.name.monospace.tr", "monospace");
pref("font.name.serif.x-baltic", "serif");
pref("font.name.sans-serif.x-baltic", "sans-serif");
pref("font.name.monospace.x-baltic", "monospace");
-pref("font.name.serif.x-central-euro", "Times");
-pref("font.name.sans-serif.x-central-euro", "Helvetica");
-pref("font.name.monospace.x-central-euro", "Courier");
+pref("font.name.serif.x-central-euro", "serif");
+pref("font.name.sans-serif.x-central-euro", "sans-serif");
+pref("font.name.monospace.x-central-euro", "monospace");
pref("font.name.serif.x-cyrillic", "serif");
pref("font.name.sans-serif.x-cyrillic", "sans-serif");
pref("font.name.monospace.x-cyrillic", "monospace");
-pref("font.name.serif.x-unicode", "Times");
-pref("font.name.sans-serif.x-unicode", "Helvetica");
-pref("font.name.monospace.x-unicode", "Courier");
+pref("font.name.serif.x-unicode", "serif");
+pref("font.name.sans-serif.x-unicode", "sans-serif");
+pref("font.name.monospace.x-unicode", "monospace");
-pref("font.name.serif.x-user-def", "Times");
-pref("font.name.sans-serif.x-user-def", "Helvetica");
-pref("font.name.monospace.x-user-def", "Courier");
+pref("font.name.serif.x-user-def", "serif");
+pref("font.name.sans-serif.x-user-def", "sans-serif");
+pref("font.name.monospace.x-user-def", "monospace");
-pref("font.name.serif.x-western", "Times");
-pref("font.name.sans-serif.x-western", "Helvetica");
-pref("font.name.monospace.x-western", "Courier");
+pref("font.name.serif.x-western", "serif");
+pref("font.name.sans-serif.x-western", "sans-serif");
+pref("font.name.monospace.x-western", "monospace");
pref("font.name.serif.zh-CN", "serif");
pref("font.name.sans-serif.zh-CN", "sans-serif");
--- iceape/mailnews/mailnews.js
+++ iceape/mailnews/mailnews.js
@@ -339,7 +339,7 @@
pref("mailnews.confirm.moveFoldersToTrash", true);
-pref("mailnews.reuse_message_window", true);
+pref("mailnews.reuse_message_window", false);
pref("mailnews.reuse_thread_window2", false);
pref("mailnews.open_window_warning", 10); // warn user if they attempt to open more than this many messages at once
@@ -592,7 +592,7 @@
// see abCommon.js and ABSearchDialog.js
pref("mailnews.ui.advanced_directory_search_results.version", 1);
//If set to a number greater than 0, msg compose windows will be recycled in order to open them quickly
-pref("mail.compose.max_recycled_windows", 1);
+pref("mail.compose.max_recycled_windows", 0);
// true makes it so we persist the open state of news server when starting up the 3 pane
// this is costly, as it might result in network activity.
#! /bin/sh /usr/share/dpatch/dpatch-run
## 85_syspref.dpatch by <glandium@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add a syspref preferences directory.
@DPATCH@
--- iceape/modules/libpref/src/nsPrefService.cpp
+++ iceape/modules/libpref/src/nsPrefService.cpp
@@ -755,6 +755,21 @@
NS_WARNING("Error parsing application default preferences.");
}
+ // Load files from defaults/syspref
+ nsCOMPtr<nsIFile> SysPrefDir;
+ rv = defaultPrefDir->GetParent(getter_AddRefs(SysPrefDir));
+ NS_ENSURE_SUCCESS(rv, rv);
+ rv = SysPrefDir->AppendNative(NS_LITERAL_CSTRING("syspref"));
+ NS_ENSURE_SUCCESS(rv, rv);
+ PRBool exists;
+ if (NS_SUCCEEDED(SysPrefDir->Exists(&exists)) && exists) {
+ rv = pref_LoadPrefsInDir(SysPrefDir, nsnull, 0);
+ if (NS_FAILED(rv)) {
+ NS_WARNING("Error parsing system default preferences.");
+ }
+
+ }
+
// xxxbsmedberg: TODO load default prefs from a category
// but the architecture is not quite there yet