diff -r ecd5bb5744dc -r f6b055dd94bc firefox-kde.patch --- a/firefox-kde.patch Sat Mar 31 09:26:42 2012 +0200 +++ b/firefox-kde.patch Sat Mar 31 22:19:28 2012 +0200 @@ -2,7 +2,7 @@ new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1118 @@ +@@ -0,0 +1,1117 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -43,6 +43,7 @@ +# David Dahl +# Frank Yan +# Victor Porof ++# Paul Rouget +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or @@ -95,6 +96,7 @@ + lightweightthemes="true" + lightweightthemesfooter="browser-bottombox" + windowtype="navigator:browser" ++ macanimationtype="document" + screenX="4" screenY="4" + browsingmode="normal" + persist="screenX screenY width height sizemode"> @@ -231,20 +233,21 @@ + + + -+ ++ ++ ++ ++ ++ ++ + + @@ -309,7 +312,7 @@ + type="arrow" + hidden="true" + noautofocus="true" -+ onpopupshown="document.getElementById('identity-popup-more-info-button').focus();" ++ onpopupshown="gIdentityHandler.onPopupShown(event);" + level="top"> + + @@ -529,6 +532,7 @@ + + + ++ + + -+ ++ ++ ++ ++ ++ +#ifndef XP_MACOSX -+ ++ +#endif -+ -+ + + + + -+ -+ -+ -+ -+ ++ + + + @@ -1124,10 +1123,10 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn --- a/browser/base/jar.mn +++ b/browser/base/jar.mn -@@ -23,16 +23,18 @@ browser.jar: - content/browser/aboutHome-restore-icon-small.png (content/aboutHome-restore-icon-small.png) - content/browser/aboutHome-snippet1.png (content/aboutHome-snippet1.png) - content/browser/aboutHome-snippet2.png (content/aboutHome-snippet2.png) +@@ -32,16 +32,18 @@ browser.jar: + content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png) + content/browser/abouthome/mozilla.png (content/abouthome/mozilla.png) + content/browser/abouthome/noise.png (content/abouthome/noise.png) content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) * content/browser/browser.css (content/browser.css) @@ -1137,12 +1136,12 @@ +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) * content/browser/content.js (content/content.js) - * content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml) * content/browser/newtab/newTab.xul (content/newtab/newTab.xul) * content/browser/newtab/newTab.js (content/newtab/newTab.js) content/browser/newtab/newTab.css (content/newtab/newTab.css) * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) + * content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) 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 @@ -1277,7 +1276,7 @@ new file mode 100644 --- /dev/null +++ b/browser/components/shell/src/nsKDEShellService.cpp -@@ -0,0 +1,257 @@ +@@ -0,0 +1,264 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -1419,6 +1418,13 @@ +} + +NS_IMETHODIMP ++nsKDEShellService::GetCanSetDesktopBackground(bool* aResult) ++{ ++ *aResult = true; ++ return NS_OK; ++} ++ ++NS_IMETHODIMP +nsKDEShellService::SetDesktopBackground(nsIDOMElement* aElement, + PRInt32 aPosition) + { @@ -1709,7 +1715,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 -@@ -450,16 +450,17 @@ +@@ -467,16 +467,17 @@ #endif #endif