commit d4c075474f7943f61668c2475bbebff0b790e9ea Author: Sukhbir Singh sukhbir@torproject.org Date: Sat Mar 19 07:51:41 2016 -0400

Rebase preferences.patch --- projects/instantbird/preferences.patch | 163 ++++++++++----------------------- 1 file changed, 48 insertions(+), 115 deletions(-)

diff --git a/projects/instantbird/preferences.patch b/projects/instantbird/preferences.patch index 9af290b..85bd49e 100644 --- a/projects/instantbird/preferences.patch +++ b/projects/instantbird/preferences.patch @@ -1,56 +1,56 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js --- a/im/app/profile/all-instantbird.js +++ b/im/app/profile/all-instantbird.js -@@ -59,19 +59,16 @@ pref("extensions.mintrayr.startMinimized - // For Linux, use single click. - pref("extensions.mintrayr.singleClickRestore", true); - #else - // For Windows, use double click. - pref("extensions.mintrayr.singleClickRestore", false); - #endif - #endif - --// Whether message related sounds should be played at all. If this is enabled --// then the more specific prefs are checked as well. +@@ -28,7 +28,7 @@ + // 0 = spellcheck nothing + // 1 = check multi-line controls [default] + // 2 = check multi/single line controls +-pref("layout.spellcheckDefault", 1); ++pref("layout.spellcheckDefault", 0); + + pref("messenger.accounts.convertOldPasswords", true); + pref("messenger.accounts.promptOnDelete", true); +@@ -66,18 +66,18 @@ + + // Whether message related sounds should be played at all. If this is enabled + // then the more specific prefs are checked as well. -pref("messenger.options.playSounds.message", true); ++pref("messenger.options.playSounds.message", false); // Specifies whether each message event should trigger a sound for incoming // and outgoing messages, or when your nickname is mentioned in a chat. - pref("messenger.options.playSounds.outgoing", true); - pref("messenger.options.playSounds.incoming", true); - pref("messenger.options.playSounds.alert", true); +-pref("messenger.options.playSounds.outgoing", true); +-pref("messenger.options.playSounds.incoming", true); +-pref("messenger.options.playSounds.alert", true); ++pref("messenger.options.playSounds.outgoing", false); ++pref("messenger.options.playSounds.incoming", false); ++pref("messenger.options.playSounds.alert", false); // Whether contact list related sounds should be played at all. If this is // enabled then the more specific prefs are checked as well. pref("messenger.options.playSounds.blist", false); -@@ -109,41 +106,33 @@ pref("browser.preferences.animateFadeIn" - pref("browser.zoom.full", true); - pref("conversation.zoomLevel", "1.0"); - - pref("accessibility.typeaheadfind", false); - pref("accessibility.typeaheadfind.timeout", 5000); - pref("accessibility.typeaheadfind.linksonly", false); + // Specifies whether sounds should be played on login/logout events. +-pref("messenger.options.playSounds.login", true); +-pref("messenger.options.playSounds.logout", true); ++pref("messenger.options.playSounds.login", false); ++pref("messenger.options.playSounds.logout", false); + + pref("font.default.x-western", "sans-serif"); + pref("font.default.x-unicode", "sans-serif"); +@@ -115,12 +115,12 @@ pref("accessibility.typeaheadfind.flashBar", 1);

--// Whether or not app updates are enabled + // Whether or not app updates are enabled -pref("app.update.enabled", true); -- --// This preference turns on app.update.mode and allows automatic download and --// install to take place. We use a separate boolean toggle for this to make --// the UI easier to construct. ++pref("app.update.enabled", false); + + // This preference turns on app.update.mode and allows automatic download and + // install to take place. We use a separate boolean toggle for this to make + // the UI easier to construct. -pref("app.update.auto", true); -- ++pref("app.update.auto", false); + // Defines how the Application Update Service notifies the user about updates: // - // AUM Set to: Minor Releases: Major Releases: - // 0 download no prompt download no prompt - // 1 download no prompt download no prompt if no incompatibilities - // 2 download no prompt prompt - // - // See chart in nsUpdateService.js.in for more details - // - pref("app.update.mode", 1); - - // If set to true, the Update Service will present no UI for any event. - pref("app.update.silent", false); +@@ -138,7 +138,7 @@

// If set to true, the Update Service will apply updates in the background // when it finishes downloading them. @@ -59,17 +59,7 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.

// Update service URL: // You do not need to use all the %VAR% parameters. Use what you need, %PRODUCT%,%VERSION%,%BUILD_ID%,%CHANNEL% for example - pref("app.update.url", "https://update.instantbird.org/1/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGE..."); - - // URL user can browse to manually if for some reason all update installation - // attempts fail. - pref("app.update.url.manual", "http://www.instantbird.com/download.html"); -@@ -194,17 +183,17 @@ pref("browser.search.defaultenginename", - // disable logging for the search service by default - pref("browser.search.log", false); - - // Ordering of Search Engines in the Engine list. - pref("browser.search.order.1", "chrome://instantbird/locale/region.properties"); +@@ -202,7 +202,7 @@ pref("browser.search.order.2", "chrome://instantbird/locale/region.properties");

// send ping to the server to update @@ -78,17 +68,7 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.

// disable logging for the search service update system by default pref("browser.search.update.log", false); - - // Check whether we need to perform engine updates every 6 hours - pref("browser.search.updateinterval", 6); - - /* Extension manager */ -@@ -214,17 +203,17 @@ pref("xpinstall.dialog.progress.chrome", - pref("xpinstall.dialog.progress.type.skin", "Extension:Manager"); - pref("xpinstall.dialog.progress.type.chrome", "Extension:Manager"); - pref("extensions.dss.enabled", false); - pref("extensions.dss.switchPending", false); - pref("extensions.ignoreMTimeChanges", false); +@@ -222,10 +222,10 @@ pref("extensions.logging.enabled", false); pref("general.skins.selectedSkin", "classic/1.0");

@@ -96,18 +76,12 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. +pref("extensions.update.enabled", false); pref("extensions.update.interval", 86400); pref("extensions.update.url", "https://addons.instantbird.org/services/update.php?reqVersion=%REQ_VERSION%&..."); - pref("extensions.update.autoUpdateDefault", true); +-pref("extensions.update.autoUpdateDefault", true); ++pref("extensions.update.autoUpdateDefault", false);

// Preferences for the Get Add-ons pane pref("extensions.getAddons.cache.enabled", false); - pref("extensions.getAddons.browseAddons", "https://addons.instantbird.org/%LOCALE%/%APP%"); - pref("extensions.getAddons.maxResults", 5); -@@ -237,35 +226,32 @@ pref("extensions.webservice.discoverURL" - pref("extensions.getMoreExtensionsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/extensions/"); - pref("extensions.getMoreThemesURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/themes/"); - pref("extensions.getMorePluginsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/plugins/"); - pref("extensions.getMoreMessageStylesURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/messagestyles/"); - pref("extensions.getMoreEmoticonsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/emoticons/"); +@@ -245,9 +245,9 @@ pref("extensions.getMoreProtocolsURL", "https://add-ons.instantbird.org/%LOCALE%/%APP%/%VERSION%/protocols/");

// suppress external-load warning for standard browser schemes @@ -120,41 +94,16 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.

// don't load links inside Instantbird pref("network.protocol-handler.expose-all", false); - // Although we allow these to be exposed internally, there are various places - // (e.g. message pane) where we may divert them out to external applications. - pref("network.protocol-handler.expose.about", true); - pref("network.protocol-handler.expose.http", true); - pref("network.protocol-handler.expose.https", true); - - // expose javascript: so that message themes can use it. - // javascript: links inside messages are filtered out. +@@ -262,7 +262,7 @@ pref("network.protocol-handler.expose.javascript", true);

--// 0-Accept, 1-dontAcceptForeign, 2-dontUse + // 0-Accept, 1-dontAcceptForeign, 2-dontUse -pref("network.cookie.cookieBehavior", 0); -- ++pref("network.cookie.cookieBehavior", 1); + // The breakpad report server to link to in about:crashes pref("breakpad.reportURL", "http://crash-stats.instantbird.com/report/index/"); - - // We have an Error Console menu item by default so let's display chrome errors - pref("javascript.options.showInConsole", true); - #ifdef DEBUG - // In debug builds, also display warnings by default - pref("javascript.options.strict", true); -@@ -292,19 +278,89 @@ pref("browser.tabs.tabClipWidth", 140); - - // Where to show tab close buttons: - // 0 on active tab only - // 1 on all tabs until tabClipWidth is reached, then active tab only - // 2 no close buttons at all - // 3 at the end of the tabstrip - pref("browser.tabs.closeButtons", 1); - --#expand pref("chat.irc.defaultQuitMessage", "Instantbird __APP_VERSION__ -- http://www.instantbird.com"); -+#expand pref("chat.irc.defaultQuitMessage", ""); - - pref("chat.twitter.consumerKey", "TSuyS1ieRAkB3qWv8yyEw"); - pref("chat.twitter.consumerSecret", "DKtKaSf5a7pBNhdBsSZHTnI5Y03hRlPFYWmb4xXBlkU"); +@@ -307,7 +307,61 @@

// Comma separated list of prpl ids that should use libpurple even if there is // a JS implementation. This is used to land JS-prpls pref'ed off in nightlies. @@ -187,8 +136,6 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. +pref("network.dns.disablePrefetch", true); +// Disable SPDY +pref("network.http.spdy.enabled", false); -+// Do not accept third-party cookies -+pref("network.cookie.cookieBehavior", 1); +// Set the user-agent to Instantbird stable +pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:25.0) Gecko/20100101 Instantbird/1.5"); + @@ -202,8 +149,6 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. +pref("messenger.status.awayWhenIdle", false); +pref("messenger.status.defaultIdleAwayMessage", ""); +pref("messenger.status.reportIdle", false); -+// Do not play sounds on messaging events -+pref("messenger.options.playSounds.message", false); +// Disable text formatting (remove the tags) +pref("messenger.options.filterMode", 0); +// Disable typing notifications @@ -222,15 +167,3 @@ diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird. +// Disable hardware acceleration +pref("gfx.direct2d.disabled", true); +pref("layers.acceleration.disabled", true); -+ -+// Updates -+// Do not auto-update Instantbird -+pref("app.update.enabled", false); -+pref("app.update.auto", false); -+// Do not auto-update extensions -+pref("extensions.update.enabled", false); -+pref("extensions.update.autoUpdateDefault", false); -+// Do not send ping to the server to update -+pref("browser.search.update", false); -+// Set baseURL to Firefox default to prevent console errors -+pref("app.support.baseURL", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/");