diff -r f7a8fa97a57e -r 8094e6bba260 firefox-kde.patch --- a/firefox-kde.patch Sat Mar 18 11:18:01 2017 +0100 +++ b/firefox-kde.patch Sat Mar 18 11:29:43 2017 +0100 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 1c4e33861cfcffe5a189802cf97957b0701260db +# Parent 1ec12b7509b6dcb0d2c1b77a8f93f81c4381008b diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul new file mode 100644 @@ -1143,7 +1143,7 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn --- a/browser/base/jar.mn +++ b/browser/base/jar.mn -@@ -66,16 +66,18 @@ browser.jar: +@@ -60,16 +60,18 @@ browser.jar: content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) content/browser/aboutProviderDirectory.xhtml (content/aboutProviderDirectory.xhtml) content/browser/aboutTabCrashed.css (content/aboutTabCrashed.css) @@ -1159,7 +1159,7 @@ content/browser/browser-ctrlTab.js (content/browser-ctrlTab.js) content/browser/browser-customization.js (content/browser-customization.js) content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js) - content/browser/browser-devedition.js (content/browser-devedition.js) + content/browser/browser-compacttheme.js (content/browser-compacttheme.js) content/browser/browser-feeds.js (content/browser-feeds.js) content/browser/browser-fullScreenAndPointerLock.js (content/browser-fullScreenAndPointerLock.js) diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp @@ -1225,8 +1225,7 @@ diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js --- a/browser/components/preferences/in-content/main.js +++ b/browser/components/preferences/in-content/main.js -@@ -33,16 +33,22 @@ var gMainPane = { - if (AppConstants.platform == "win") { +@@ -32,16 +32,22 @@ var gMainPane = { // In Windows 8 we launch the control panel since it's the only // way to get all file type association prefs. So we don't know // when the user will select the default. We refresh here periodically @@ -1234,21 +1233,22 @@ // be set while the prefs are open. window.setInterval(this.updateSetDefaultBrowser.bind(this), 1000); } -+ + } + var env = Components.classes["@mozilla.org/process/environment;1"] -+ .getService(Components.interfaces.nsIEnvironment); ++ .getService(Components.interfaces.nsIEnvironment); + var kde_session = 0; + if (env.get('KDE_FULL_SESSION') == "true") + kde_session = 1; - } ++ } // set up the "use current page" label-changing listener this._updateUseCurrentButton(); - window.addEventListener("focus", this._updateUseCurrentButton.bind(this), false); + window.addEventListener("focus", this._updateUseCurrentButton.bind(this)); this.updateBrowserStartupLastSession(); -@@ -704,16 +710,27 @@ var gMainPane = { + if (AppConstants.platform == "win") { +@@ -680,16 +686,27 @@ var gMainPane = { let alwaysCheckPref = document.getElementById("browser.shell.checkDefaultBrowser"); alwaysCheckPref.value = true; @@ -1591,7 +1591,7 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -652,16 +652,17 @@ +@@ -638,16 +638,17 @@ @RESPATH@/greprefs.js @RESPATH@/defaults/autoconfig/prefcalls.js @RESPATH@/browser/defaults/permissions