equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 89cbe8c49d05965b87815143d1944ab6964f12c7 |
2 # Parent 2bfd3982be72061c3f5879a5fbceb4c33f96a0cd |
3 |
3 |
4 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul |
4 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul |
5 new file mode 100644 |
5 new file mode 100644 |
6 --- /dev/null |
6 --- /dev/null |
7 +++ b/browser/base/content/browser-kde.xul |
7 +++ b/browser/base/content/browser-kde.xul |
1255 + |
1255 + |
1256 +</window> |
1256 +</window> |
1257 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1257 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1258 --- a/browser/base/jar.mn |
1258 --- a/browser/base/jar.mn |
1259 +++ b/browser/base/jar.mn |
1259 +++ b/browser/base/jar.mn |
1260 @@ -52,16 +52,18 @@ browser.jar: |
1260 @@ -45,16 +45,18 @@ browser.jar: |
1261 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1261 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1262 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1262 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1263 content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) |
1263 content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) |
1264 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1264 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1265 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1265 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1337 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
1337 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
1338 #endif |
1338 #endif |
1339 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js |
1339 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js |
1340 --- a/browser/components/preferences/in-content/main.js |
1340 --- a/browser/components/preferences/in-content/main.js |
1341 +++ b/browser/components/preferences/in-content/main.js |
1341 +++ b/browser/components/preferences/in-content/main.js |
1342 @@ -193,16 +193,23 @@ var gMainPane = { |
1342 @@ -330,16 +330,23 @@ var gMainPane = { |
1343 this._backoffIndex++ : backoffTimes.length - 1]); |
1343 this._backoffIndex++ : backoffTimes.length - 1]); |
1344 }; |
1344 }; |
1345 |
1345 |
1346 window.setTimeout(() => { |
1346 window.setTimeout(() => { |
1347 window.requestIdleCallback(pollForDefaultBrowser); |
1347 window.requestIdleCallback(pollForDefaultBrowser); |
1361 let performanceSettingsLink = document.getElementById("performanceSettingsLearnMore"); |
1361 let performanceSettingsLink = document.getElementById("performanceSettingsLearnMore"); |
1362 let performanceSettingsUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") + "performance"; |
1362 let performanceSettingsUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") + "performance"; |
1363 performanceSettingsLink.setAttribute("href", performanceSettingsUrl); |
1363 performanceSettingsLink.setAttribute("href", performanceSettingsUrl); |
1364 |
1364 |
1365 this.updateDefaultPerformanceSettingsPref(); |
1365 this.updateDefaultPerformanceSettingsPref(); |
1366 @@ -898,16 +905,27 @@ var gMainPane = { |
1366 @@ -1035,16 +1042,27 @@ var gMainPane = { |
1367 // Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser. |
1367 // Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser. |
1368 this._backoffIndex = 0; |
1368 this._backoffIndex = 0; |
1369 |
1369 |
1370 let shellSvc = getShellService(); |
1370 let shellSvc = getShellService(); |
1371 if (!shellSvc) |
1371 if (!shellSvc) |
1705 + |
1705 + |
1706 +#endif // nsunixshellservice_h____ |
1706 +#endif // nsunixshellservice_h____ |
1707 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1707 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1708 --- a/browser/installer/package-manifest.in |
1708 --- a/browser/installer/package-manifest.in |
1709 +++ b/browser/installer/package-manifest.in |
1709 +++ b/browser/installer/package-manifest.in |
1710 @@ -657,16 +657,18 @@ |
1710 @@ -649,16 +649,18 @@ |
1711 @RESPATH@/browser/defaults/blocklists |
1711 @RESPATH@/browser/defaults/blocklists |
1712 @RESPATH@/browser/defaults/pinning |
1712 @RESPATH@/browser/defaults/pinning |
1713 |
1713 |
1714 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1714 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1715 ; Technically this is an app pref file, but we are keeping it in the original |
1715 ; Technically this is an app pref file, but we are keeping it in the original |