1140 +# Introducing the iframe dynamically, as needed, was found to be better than |
1140 +# Introducing the iframe dynamically, as needed, was found to be better than |
1141 +# starting with an empty iframe here in browser.xul from a Ts standpoint. |
1141 +# starting with an empty iframe here in browser.xul from a Ts standpoint. |
1142 +</deck> |
1142 +</deck> |
1143 + |
1143 + |
1144 +</window> |
1144 +</window> |
1145 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
|
1146 --- a/browser/base/jar.mn |
|
1147 +++ b/browser/base/jar.mn |
|
1148 @@ -60,16 +60,18 @@ browser.jar: |
|
1149 content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
|
1150 content/browser/aboutProviderDirectory.xhtml (content/aboutProviderDirectory.xhtml) |
|
1151 content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) |
|
1152 content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) |
|
1153 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
|
1154 * content/browser/browser.css (content/browser.css) |
|
1155 content/browser/browser.js (content/browser.js) |
|
1156 * content/browser/browser.xul (content/browser.xul) |
|
1157 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
|
1158 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
|
1159 content/browser/browser-addons.js (content/browser-addons.js) |
|
1160 content/browser/browser-captivePortal.js (content/browser-captivePortal.js) |
|
1161 content/browser/browser-ctrlTab.js (content/browser-ctrlTab.js) |
|
1162 content/browser/browser-customization.js (content/browser-customization.js) |
|
1163 content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js) |
|
1164 content/browser/browser-compacttheme.js (content/browser-compacttheme.js) |
|
1165 content/browser/browser-feeds.js (content/browser-feeds.js) |
|
1166 content/browser/browser-fullScreenAndPointerLock.js (content/browser-fullScreenAndPointerLock.js) |
|
1167 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1145 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1168 --- a/browser/components/build/nsModule.cpp |
1146 --- a/browser/components/build/nsModule.cpp |
1169 +++ b/browser/components/build/nsModule.cpp |
1147 +++ b/browser/components/build/nsModule.cpp |
1170 @@ -8,17 +8,17 @@ |
1148 @@ -8,17 +8,17 @@ |
1171 #include "nsBrowserCompsCID.h" |
1149 #include "nsBrowserCompsCID.h" |
1225 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
1203 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
1226 #endif |
1204 #endif |
1227 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js |
1205 diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js |
1228 --- a/browser/components/preferences/in-content/main.js |
1206 --- a/browser/components/preferences/in-content/main.js |
1229 +++ b/browser/components/preferences/in-content/main.js |
1207 +++ b/browser/components/preferences/in-content/main.js |
1230 @@ -32,16 +32,22 @@ var gMainPane = { |
1208 @@ -34,16 +34,22 @@ var gMainPane = { |
1231 // In Windows 8 we launch the control panel since it's the only |
1209 // In Windows 8 we launch the control panel since it's the only |
1232 // way to get all file type association prefs. So we don't know |
1210 // way to get all file type association prefs. So we don't know |
1233 // when the user will select the default. We refresh here periodically |
1211 // when the user will select the default. We refresh here periodically |
1234 // in case the default changes. On other Windows OS's defaults can also |
1212 // in case the default changes. On other Windows OS's defaults can also |
1235 // be set while the prefs are open. |
1213 // be set while the prefs are open. |
1236 window.setInterval(this.updateSetDefaultBrowser.bind(this), 1000); |
1214 window.setInterval(this.updateSetDefaultBrowser.bind(this), 1000); |
1237 } |
1215 } |
1238 } |
1216 } |
1239 + var env = Components.classes["@mozilla.org/process/environment;1"] |
1217 + var env = Components.classes["@mozilla.org/process/environment;1"] |
1240 + .getService(Components.interfaces.nsIEnvironment); |
1218 + .getService(Components.interfaces.nsIEnvironment); |
1241 + var kde_session = 0; |
1219 + var kde_session = 0; |
1242 + if (env.get('KDE_FULL_SESSION') == "true") { |
1220 + if (env.get('KDE_FULL_SESSION') == "true") { |
1243 + kde_session = 1; |
1221 + kde_session = 1; |
1244 + } |
1222 + } |
1245 |
1223 |
1246 // set up the "use current page" label-changing listener |
1224 // set up the "use current page" label-changing listener |
1247 this._updateUseCurrentButton(); |
1225 this._updateUseCurrentButton(); |
1248 window.addEventListener("focus", this._updateUseCurrentButton.bind(this)); |
1226 window.addEventListener("focus", this._updateUseCurrentButton.bind(this), false); |
1249 |
1227 |
1250 this.updateBrowserStartupLastSession(); |
1228 this.updateBrowserStartupLastSession(); |
1251 |
1229 |
1252 if (AppConstants.platform == "win") { |
1230 if (AppConstants.platform == "win") { |
1253 @@ -680,16 +686,27 @@ var gMainPane = { |
1231 @@ -704,16 +710,27 @@ var gMainPane = { |
1254 let alwaysCheckPref = document.getElementById("browser.shell.checkDefaultBrowser"); |
1232 let alwaysCheckPref = document.getElementById("browser.shell.checkDefaultBrowser"); |
1255 alwaysCheckPref.value = true; |
1233 alwaysCheckPref.value = true; |
1256 |
1234 |
1257 let shellSvc = getShellService(); |
1235 let shellSvc = getShellService(); |
1258 if (!shellSvc) |
1236 if (!shellSvc) |
1591 + |
1569 + |
1592 +#endif // nsunixshellservice_h____ |
1570 +#endif // nsunixshellservice_h____ |
1593 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1571 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1594 --- a/browser/installer/package-manifest.in |
1572 --- a/browser/installer/package-manifest.in |
1595 +++ b/browser/installer/package-manifest.in |
1573 +++ b/browser/installer/package-manifest.in |
1596 @@ -638,16 +638,17 @@ |
1574 @@ -652,16 +652,17 @@ |
1597 @RESPATH@/greprefs.js |
1575 @RESPATH@/greprefs.js |
1598 @RESPATH@/defaults/autoconfig/prefcalls.js |
1576 @RESPATH@/defaults/autoconfig/prefcalls.js |
1599 @RESPATH@/browser/defaults/permissions |
1577 @RESPATH@/browser/defaults/permissions |
1600 |
1578 |
1601 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1579 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |