summaryrefslogtreecommitdiffstats
path: root/application/palemoon/components
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-04-04 03:17:39 -0400
committerMatt A. Tobin <email@mattatobin.com>2018-04-04 03:17:39 -0400
commit3cf6d2b2d73b3b09fb268a2b3927d920883745fb (patch)
tree1fbeb191509fedf38135deb0516eab51201640d4 /application/palemoon/components
parent59bf4204a84f7638d3f89a29bc7c04e5dc401369 (diff)
downloadUXP-3cf6d2b2d73b3b09fb268a2b3927d920883745fb.tar
UXP-3cf6d2b2d73b3b09fb268a2b3927d920883745fb.tar.gz
UXP-3cf6d2b2d73b3b09fb268a2b3927d920883745fb.tar.lz
UXP-3cf6d2b2d73b3b09fb268a2b3927d920883745fb.tar.xz
UXP-3cf6d2b2d73b3b09fb268a2b3927d920883745fb.zip
Sync Pale Moon code
Diffstat (limited to 'application/palemoon/components')
-rw-r--r--application/palemoon/components/nsBrowserGlue.js4
-rw-r--r--application/palemoon/components/sessionstore/nsSessionStartup.js11
2 files changed, 10 insertions, 5 deletions
diff --git a/application/palemoon/components/nsBrowserGlue.js b/application/palemoon/components/nsBrowserGlue.js
index 705593b59..8fc24c7d3 100644
--- a/application/palemoon/components/nsBrowserGlue.js
+++ b/application/palemoon/components/nsBrowserGlue.js
@@ -1213,7 +1213,7 @@ BrowserGlue.prototype = {
},
_migrateUI: function BG__migrateUI() {
- const UI_VERSION = 14;
+ const UI_VERSION = 15;
const BROWSER_DOCURL = "chrome://browser/content/browser.xul#";
let currentUIVersion = 0;
try {
@@ -1395,7 +1395,7 @@ BrowserGlue.prototype = {
}
}
- if (currentUIVersion < 14) {
+ if (currentUIVersion < 16) {
// Migrate Sync from pmsync.palemoon.net to pmsync.palemoon.org
try {
let syncURL = Services.prefs.getCharPref("services.sync.clusterURL");
diff --git a/application/palemoon/components/sessionstore/nsSessionStartup.js b/application/palemoon/components/sessionstore/nsSessionStartup.js
index 024246619..7f07e9050 100644
--- a/application/palemoon/components/sessionstore/nsSessionStartup.js
+++ b/application/palemoon/components/sessionstore/nsSessionStartup.js
@@ -77,9 +77,14 @@ SessionStartup.prototype = {
return;
}
- _SessionFile.read().then(
- this._onSessionFileRead.bind(this)
- );
+ if (Services.prefs.getBoolPref("browser.sessionstore.resume_session_once") ||
+ Services.prefs.getIntPref("browser.startup.page") == 3) {
+ this._ensureInitialized();
+ } else {
+ _SessionFile.read().then(
+ this._onSessionFileRead.bind(this)
+ );
+ }
},
// Wrap a string as a nsISupports