1141 + |
1141 + |
1142 +</window> |
1142 +</window> |
1143 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1143 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1144 --- a/browser/base/jar.mn |
1144 --- a/browser/base/jar.mn |
1145 +++ b/browser/base/jar.mn |
1145 +++ b/browser/base/jar.mn |
1146 @@ -66,16 +66,18 @@ browser.jar: |
1146 @@ -60,16 +60,18 @@ browser.jar: |
1147 content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
1147 content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
1148 content/browser/aboutProviderDirectory.xhtml (content/aboutProviderDirectory.xhtml) |
1148 content/browser/aboutProviderDirectory.xhtml (content/aboutProviderDirectory.xhtml) |
1149 content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) |
1149 content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) |
1150 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1150 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
1151 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1151 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1157 content/browser/browser-addons.js (content/browser-addons.js) |
1157 content/browser/browser-addons.js (content/browser-addons.js) |
1158 content/browser/browser-captivePortal.js (content/browser-captivePortal.js) |
1158 content/browser/browser-captivePortal.js (content/browser-captivePortal.js) |
1159 content/browser/browser-ctrlTab.js (content/browser-ctrlTab.js) |
1159 content/browser/browser-ctrlTab.js (content/browser-ctrlTab.js) |
1160 content/browser/browser-customization.js (content/browser-customization.js) |
1160 content/browser/browser-customization.js (content/browser-customization.js) |
1161 content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js) |
1161 content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js) |
1162 content/browser/browser-devedition.js (content/browser-devedition.js) |
1162 content/browser/browser-compacttheme.js (content/browser-compacttheme.js) |
1163 content/browser/browser-feeds.js (content/browser-feeds.js) |
1163 content/browser/browser-feeds.js (content/browser-feeds.js) |
1164 content/browser/browser-fullScreenAndPointerLock.js (content/browser-fullScreenAndPointerLock.js) |
1164 content/browser/browser-fullScreenAndPointerLock.js (content/browser-fullScreenAndPointerLock.js) |
1165 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1165 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1166 --- a/browser/components/build/nsModule.cpp |
1166 --- a/browser/components/build/nsModule.cpp |
1167 +++ b/browser/components/build/nsModule.cpp |
1167 +++ b/browser/components/build/nsModule.cpp |
1223 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
1223 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
1224 #endif |
1224 #endif |
1225 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js |
1225 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js |
1226 --- a/browser/components/preferences/in-content/main.js |
1226 --- a/browser/components/preferences/in-content/main.js |
1227 +++ b/browser/components/preferences/in-content/main.js |
1227 +++ b/browser/components/preferences/in-content/main.js |
1228 @@ -33,16 +33,22 @@ var gMainPane = { |
1228 @@ -32,16 +32,22 @@ var gMainPane = { |
1229 if (AppConstants.platform == "win") { |
|
1230 // In Windows 8 we launch the control panel since it's the only |
1229 // In Windows 8 we launch the control panel since it's the only |
1231 // way to get all file type association prefs. So we don't know |
1230 // way to get all file type association prefs. So we don't know |
1232 // when the user will select the default. We refresh here periodically |
1231 // when the user will select the default. We refresh here periodically |
1233 // in case the default changes. On other Windows OS's defaults can also |
1232 // in case the default changes. On other Windows OS's defaults can also |
1234 // be set while the prefs are open. |
1233 // be set while the prefs are open. |
1235 window.setInterval(this.updateSetDefaultBrowser.bind(this), 1000); |
1234 window.setInterval(this.updateSetDefaultBrowser.bind(this), 1000); |
1236 } |
1235 } |
1237 + |
1236 } |
1238 + var env = Components.classes["@mozilla.org/process/environment;1"] |
1237 + var env = Components.classes["@mozilla.org/process/environment;1"] |
1239 + .getService(Components.interfaces.nsIEnvironment); |
1238 + .getService(Components.interfaces.nsIEnvironment); |
1240 + var kde_session = 0; |
1239 + var kde_session = 0; |
1241 + if (env.get('KDE_FULL_SESSION') == "true") |
1240 + if (env.get('KDE_FULL_SESSION') == "true") |
1242 + kde_session = 1; |
1241 + kde_session = 1; |
1243 } |
1242 + } |
1244 |
1243 |
1245 // set up the "use current page" label-changing listener |
1244 // set up the "use current page" label-changing listener |
1246 this._updateUseCurrentButton(); |
1245 this._updateUseCurrentButton(); |
1247 window.addEventListener("focus", this._updateUseCurrentButton.bind(this), false); |
1246 window.addEventListener("focus", this._updateUseCurrentButton.bind(this)); |
1248 |
1247 |
1249 this.updateBrowserStartupLastSession(); |
1248 this.updateBrowserStartupLastSession(); |
1250 |
1249 |
1251 @@ -704,16 +710,27 @@ var gMainPane = { |
1250 if (AppConstants.platform == "win") { |
|
1251 @@ -680,16 +686,27 @@ var gMainPane = { |
1252 let alwaysCheckPref = document.getElementById("browser.shell.checkDefaultBrowser"); |
1252 let alwaysCheckPref = document.getElementById("browser.shell.checkDefaultBrowser"); |
1253 alwaysCheckPref.value = true; |
1253 alwaysCheckPref.value = true; |
1254 |
1254 |
1255 let shellSvc = getShellService(); |
1255 let shellSvc = getShellService(); |
1256 if (!shellSvc) |
1256 if (!shellSvc) |
1589 + |
1589 + |
1590 +#endif // nsunixshellservice_h____ |
1590 +#endif // nsunixshellservice_h____ |
1591 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1591 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1592 --- a/browser/installer/package-manifest.in |
1592 --- a/browser/installer/package-manifest.in |
1593 +++ b/browser/installer/package-manifest.in |
1593 +++ b/browser/installer/package-manifest.in |
1594 @@ -652,16 +652,17 @@ |
1594 @@ -638,16 +638,17 @@ |
1595 @RESPATH@/greprefs.js |
1595 @RESPATH@/greprefs.js |
1596 @RESPATH@/defaults/autoconfig/prefcalls.js |
1596 @RESPATH@/defaults/autoconfig/prefcalls.js |
1597 @RESPATH@/browser/defaults/permissions |
1597 @RESPATH@/browser/defaults/permissions |
1598 |
1598 |
1599 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1599 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |