diff -r 42e50afb9638 -r 4665fe34fbce firefox-kde.patch --- a/firefox-kde.patch Mon Apr 17 14:57:22 2017 +0200 +++ b/firefox-kde.patch Mon Apr 17 15:11:09 2017 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent cd2e751044703d5b7130db1cbabc726370f4156e +# Parent 9488ac970162c2224614d544b9bab7b984b38c90 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul new file mode 100644 @@ -1142,6 +1142,28 @@ + + + +diff --git a/browser/base/jar.mn b/browser/base/jar.mn +--- a/browser/base/jar.mn ++++ b/browser/base/jar.mn +@@ -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) + content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js) + content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) + * content/browser/browser.css (content/browser.css) + content/browser/browser.js (content/browser.js) + * content/browser/browser.xul (content/browser.xul) ++* content/browser/browser-kde.xul (content/browser-kde.xul) ++% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde + content/browser/browser-addons.js (content/browser-addons.js) + content/browser/browser-captivePortal.js (content/browser-captivePortal.js) + 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-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 --- a/browser/components/build/nsModule.cpp +++ b/browser/components/build/nsModule.cpp @@ -1205,7 +1227,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 -@@ -34,16 +34,22 @@ var gMainPane = { +@@ -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 @@ -1215,20 +1237,20 @@ } } + 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; ++ 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(); if (AppConstants.platform == "win") { -@@ -704,16 +710,27 @@ var gMainPane = { +@@ -680,16 +686,27 @@ var gMainPane = { let alwaysCheckPref = document.getElementById("browser.shell.checkDefaultBrowser"); alwaysCheckPref.value = true; @@ -1571,7 +1593,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