--- a/firefox-kde.patch Thu Oct 24 20:13:14 2013 +0200
+++ b/firefox-kde.patch Tue Nov 19 18:46:37 2013 +0100
@@ -2,7 +2,7 @@
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1161 @@
+@@ -0,0 +1,1158 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@@ -129,6 +129,9 @@
+ <!-- for url bar autocomplete -->
+ <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
+
++ <!-- for select dropdowns -->
++ <menupopup id="ContentSelectDropdown" rolluponmousewheel="true" hidden="true"/>
++
+ <!-- for invalid form error message -->
+ <panel id="invalid-form-popup" type="arrow" orient="vertical" noautofocus="true" hidden="true" level="parent">
+ <description/>
@@ -509,8 +512,6 @@
+ <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
-+ <image id="alert-plugins-notification-icon" class="notification-anchor-icon" role="button"/>
-+ <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
@@ -745,11 +746,6 @@
+ oncommand="SocialUI.showLearnMore();"/>
+ </menupopup>
+ </toolbarbutton>
-+ <toolbarbutton id="social-mark-button"
-+ class="toolbarbutton-1"
-+ hidden="true"
-+ disabled="true"
-+ command="Social:TogglePageMark"/>
+ </toolbaritem>
+
+ <hbox id="window-controls" hidden="true" pack="end">
@@ -1029,7 +1025,8 @@
+ flex="1" contenttooltip="aHTMLTooltip"
+ tabcontainer="tabbrowser-tabs"
+ contentcontextmenu="contentAreaContextMenu"
-+ autocompletepopup="PopupAutoComplete"/>
++ autocompletepopup="PopupAutoComplete"
++ selectpopup="ContentSelectDropdown"/>
+ <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/>
+ </vbox>
+ <splitter id="social-sidebar-splitter"
@@ -1167,12 +1164,12 @@
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
-@@ -52,16 +52,18 @@ browser.jar:
- content/browser/abouthealthreport/abouthealth.css (content/abouthealthreport/abouthealth.css)
+@@ -53,16 +53,18 @@ browser.jar:
#endif
content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png)
content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png)
content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml)
+ 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)
@@ -1232,19 +1229,19 @@
#endif
static const mozilla::Module::CIDEntry kBrowserCIDs[] = {
- { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor },
+ { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, nullptr, DirectoryProviderConstructor },
#if defined(XP_WIN)
- { &kNS_SHELLSERVICE_CID, false, NULL, nsWindowsShellServiceConstructor },
+ { &kNS_SHELLSERVICE_CID, false, nullptr, nsWindowsShellServiceConstructor },
#elif defined(MOZ_WIDGET_GTK)
-- { &kNS_SHELLSERVICE_CID, false, NULL, nsGNOMEShellServiceConstructor },
-+ { &kNS_SHELLSERVICE_CID, false, NULL, nsUnixShellServiceConstructor },
+- { &kNS_SHELLSERVICE_CID, false, nullptr, nsGNOMEShellServiceConstructor },
++ { &kNS_SHELLSERVICE_CID, false, nullptr, nsUnixShellServiceConstructor },
#endif
- { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor },
- { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create },
+ { &kNS_FEEDSNIFFER_CID, false, nullptr, nsFeedSnifferConstructor },
+ { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, nullptr, AboutRedirector::Create },
#if defined(XP_WIN)
- { &kNS_WINIEHISTORYENUMERATOR_CID, false, NULL, nsIEHistoryEnumeratorConstructor },
+ { &kNS_WINIEHISTORYENUMERATOR_CID, false, nullptr, nsIEHistoryEnumeratorConstructor },
#elif defined(XP_MACOSX)
- { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor },
+ { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor },
#endif
diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
--- a/browser/components/preferences/advanced.js
@@ -1301,7 +1298,7 @@
diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in
--- a/browser/components/shell/src/Makefile.in
+++ b/browser/components/shell/src/Makefile.in
-@@ -16,10 +16,12 @@ USE_STATIC_LIBS = 1
+@@ -9,10 +9,12 @@ USE_STATIC_LIBS = 1
include $(topsrcdir)/config/rules.mk
@@ -1750,7 +1747,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
-@@ -606,19 +606,21 @@
+@@ -593,19 +593,21 @@
@BINPATH@/defaults/autoconfig/prefcalls.js
@BINPATH@/browser/defaults/profile/prefs.js