diff -r e969636be188 -r 2f9f2e040647 mozilla-kde.patch --- a/mozilla-kde.patch Tue Jun 07 21:44:20 2016 +0200 +++ b/mozilla-kde.patch Wed Jun 08 13:45:00 2016 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 61cdc9af8ceaf75083e751e0d6497feddc26f7ba +# Parent f2726ebfae7cdded8e7ca6030829b0a3fae4e438 Description: Add KDE integration to Firefox (toolkit parts) Author: Wolfgang Rosenauer Author: Lubos Lunak @@ -27,7 +27,7 @@ #include "prefread.h" #include "prefapi_private_data.h" -@@ -1135,16 +1136,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char +@@ -1138,16 +1139,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char static nsresult pref_LoadPrefsInDirList(const char *listId) { @@ -62,7 +62,7 @@ return NS_OK; bool hasMore; -@@ -1160,17 +1179,17 @@ static nsresult pref_LoadPrefsInDirList( +@@ -1163,17 +1182,17 @@ static nsresult pref_LoadPrefsInDirList( nsAutoCString leaf; path->GetNativeLeafName(leaf); @@ -81,7 +81,7 @@ { nsZipItemPtr manifest(jarReader, name, true); NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); -@@ -1264,24 +1283,36 @@ static nsresult pref_InitInitialObjects( +@@ -1267,24 +1286,36 @@ static nsresult pref_InitInitialObjects( /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ static const char* specialFiles[] = { #if defined(XP_MACOSX) @@ -325,7 +325,7 @@ + xmlns="http://www.mozilla.org/xbl" + xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:xbl="http://www.mozilla.org/xbl"> -+ ++ + + + @@ -334,10 +334,10 @@ + + + -+ ++ + + -+ ++ + + + @@ -1990,20 +1992,20 @@ + ]]> + + -+ -+ -+ -+ -+ -+ ++ + + + + false -+ -+ ++ + + + + return document.getElementById(aElement.getAttribute("preference")); + + -+ ++ + + + + + + -+ ++ + + let targetObj = {}; + Components.utils.import("resource://gre/modules/DeferredTask.jsm", targetObj); @@ -2106,7 +2108,7 @@ + ]]> + + -+ ++ + + + var targetHeight = parseInt(window.getComputedStyle(this._content, "").height); @@ -2121,25 +2123,25 @@ + + + -+ // This "command" event handler tracks changes made to preferences by ++ // This "command" event handler tracks changes made to preferences by + // the user in this window. + if (event.sourceEvent) + event = event.sourceEvent; + this.userChangedValue(event.target); + + -+ // This "select" event handler tracks changes made to colorpicker ++ // This "select" event handler tracks changes made to colorpicker + // preferences by the user in this window. -+ if (event.target.localName == "colorpicker") ++ if (event.target.localName == "colorpicker") + this.userChangedValue(event.target); + + -+ // This "change" event handler tracks changes made to preferences by -+ // the user in this window. ++ // This "change" event handler tracks changes made to preferences by ++ // the user in this window. + this.userChangedValue(event.target); + + -+ // This "input" event handler tracks changes made to preferences by ++ // This "input" event handler tracks changes made to preferences by + // the user in this window. + this.userChangedValue(event.target); + @@ -2156,11 +2158,11 @@ + dump("*** No preference found for " + elements[i].getAttribute("preference") + "\n"); + } + } -+ ]]> ++ ]]> + + + -+ ++ + +