diff -r 91b462c0fd72 -r 30a00f382aed firefox-kde.patch --- a/firefox-kde.patch Sat Nov 12 16:22:36 2011 +0100 +++ b/firefox-kde.patch Fri Nov 18 07:36:46 2011 +0100 @@ -2,7 +2,7 @@ new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1055 @@ +@@ -0,0 +1,1054 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -237,7 +237,6 @@ + noautohide="true" + titlebar="normal" + close="true" -+ onpopuphiding="InspectorUI.closeInspectorUI();" + label="&inspectPanelTitle.label;"> + + @@ -962,7 +961,7 @@ + contentcontextmenu="contentAreaContextMenu" + autocompletepopup="PopupAutoComplete" + onclick="return contentAreaClick(event, false);"/> -+ ++ + + @@ -1075,11 +1074,11 @@ * 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/inspector.html (content/inspector.html) * 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) * content/browser/pageinfo/pageInfo.xml (content/pageinfo/pageInfo.xml) + * content/browser/pageinfo/feeds.js (content/pageinfo/feeds.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 @@ -1100,9 +1099,9 @@ #if !defined(XP_OS2) #include "nsOperaProfileMigrator.h" #endif - #include "nsSeamonkeyProfileMigrator.h" #if defined(XP_WIN) && !defined(__MINGW32__) -@@ -72,18 +72,16 @@ using namespace mozilla::browser; + #include "nsIEProfileMigrator.h" +@@ -71,18 +71,16 @@ using namespace mozilla::browser; ///////////////////////////////////////////////////////////////////////////// @@ -1119,10 +1118,10 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsOperaProfileMigrator) #endif NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator) - NS_GENERIC_FACTORY_CONSTRUCTOR(nsSeamonkeyProfileMigrator) #if defined(XP_WIN) && !defined(__MINGW32__) -@@ -117,17 +115,17 @@ NS_DEFINE_NAMED_CID(NS_OPERAPROFILEMIGRA - NS_DEFINE_NAMED_CID(NS_SEAMONKEYPROFILEMIGRATOR_CID); + NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEProfileMigrator) +@@ -114,17 +112,17 @@ NS_DEFINE_NAMED_CID(NS_OPERAPROFILEMIGRA + #endif NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); static const mozilla::Module::CIDEntry kBrowserCIDs[] = { @@ -1582,7 +1581,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 -@@ -434,16 +434,17 @@ +@@ -424,16 +424,17 @@ #endif #endif