--- a/firefox-kde.patch Tue Nov 19 18:46:37 2013 +0100
+++ b/firefox-kde.patch Sun Dec 29 22:45:13 2013 +0100
@@ -2,7 +2,7 @@
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1158 @@
+@@ -0,0 +1,1184 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@@ -27,6 +27,7 @@
+<window id="main-window"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
++ xmlns:html="http://www.w3.org/1999/xhtml"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+ onload="gBrowserInit.onLoad()" onunload="gBrowserInit.onUnload()" onclose="return WindowIsClosing();"
+ title="&mainWindow.title;@PRE_RELEASE_SUFFIX@"
@@ -187,6 +188,22 @@
+ </hbox>
+ </panel>
+
++ <!-- UI tour experience -->
++ <panel id="UITourTooltip"
++ type="arrow"
++ hidden="true"
++ consumeoutsideclicks="false"
++ noautofocus="true"
++ align="start"
++ orient="vertical"
++ role="alert">
++ <label id="UITourTooltipTitle" flex="1"/>
++ <description id="UITourTooltipDescription" flex="1"/>
++ </panel>
++ <html:div id="UITourHighlightContainer" style="position:relative">
++ <html:div id="UITourHighlight"></html:div>
++ </html:div>
++
+ <panel id="socialActivatedNotification"
+ type="arrow"
+ hidden="true"
@@ -346,7 +363,11 @@
+ </vbox>
+ </hbox>
+ <!-- Footer button to open security page info -->
-+ <hbox id="identity-popup-button-container" pack="end">
++ <hbox id="identity-popup-button-container" align="center">
++ <button id="identity-popup-help-icon"
++ oncommand="gIdentityHandler.handleHelpCommand(event);"
++ tooltiptext="&identity.help.tooltip;"/>
++ <spacer flex="1"/>
+ <button id="identity-popup-more-info-button"
+ label="&identity.moreInfoLinkText;"
+ oncommand="gIdentityHandler.handleMoreInfoClick(event);"/>
@@ -396,6 +417,11 @@
+
+#include popup-notifications.inc
+
++ <hbox id="downloads-animation-container" mousethrough="always">
++ <vbox id="downloads-notification-anchor">
++ <vbox id="downloads-indicator-notification"/>
++ </vbox>
++ </hbox>
+ </popupset>
+
+#ifdef CAN_DRAW_IN_TITLEBAR
@@ -547,7 +573,7 @@
+ onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
+ <image id="star-button"
+ class="urlbar-icon"
-+ onclick="BookmarkingUI.onCommand(event);"/>
++ onclick="if (event.button === 0) BookmarkingUI.onCommand(event);"/>
+ <image id="go-button"
+ class="urlbar-icon"
+ tooltiptext="&goEndCap.tooltip;"
@@ -1021,7 +1047,7 @@
+
+ <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
+ <vbox id="appcontent" flex="1">
-+ <tabbrowser id="content" disablehistory="true"
++ <tabbrowser id="content"
+ flex="1" contenttooltip="aHTMLTooltip"
+ tabcontainer="tabbrowser-tabs"
+ contentcontextmenu="contentAreaContextMenu"
@@ -1181,8 +1207,8 @@
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/newtab/preloaderContent.js (content/newtab/preloaderContent.js)
* content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul)
- content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.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
@@ -1246,7 +1272,7 @@
diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
--- a/browser/components/preferences/advanced.js
+++ b/browser/components/preferences/advanced.js
-@@ -23,16 +23,22 @@ var gAdvancedPane = {
+@@ -24,16 +24,22 @@ var gAdvancedPane = {
if (extraArgs && extraArgs["advancedTab"]){
advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]);
} else {
@@ -1269,7 +1295,7 @@
// when the user will select the default. We refresh here periodically
// in case the default changes. On other Windows OS's defaults can also
// be set while the prefs are open.
-@@ -860,14 +866,25 @@ var gAdvancedPane = {
+@@ -903,14 +909,25 @@ var gAdvancedPane = {
* Set browser as the operating system default browser.
*/
setDefaultBrowser: function()
@@ -1298,7 +1324,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
-@@ -9,10 +9,12 @@ USE_STATIC_LIBS = 1
+@@ -8,10 +8,12 @@ USE_STATIC_LIBS = 1
include $(topsrcdir)/config/rules.mk
@@ -1314,21 +1340,20 @@
diff --git a/browser/components/shell/src/moz.build b/browser/components/shell/src/moz.build
--- a/browser/components/shell/src/moz.build
+++ b/browser/components/shell/src/moz.build
-@@ -11,17 +11,19 @@ if CONFIG['OS_ARCH'] == 'WINNT':
- 'nsWindowsShellService.cpp',
+@@ -12,16 +12,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
- CPP_SOURCES += [
+ SOURCES += [
'nsMacShellService.cpp',
]
elif CONFIG['MOZ_WIDGET_GTK']:
- CPP_SOURCES += [
-+ 'nsUnixShellService.cpp',
+ SOURCES += [
'nsGNOMEShellService.cpp',
-+ 'nsKDEShellService.cpp'
++ 'nsKDEShellService.cpp',
++ 'nsUnixShellService.cpp'
]
- if CPP_SOURCES:
+ if SOURCES:
LIBRARY_NAME = 'shellservice_s'
EXTRA_COMPONENTS += [
@@ -1747,7 +1772,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
-@@ -593,19 +593,21 @@
+@@ -613,19 +613,21 @@
@BINPATH@/defaults/autoconfig/prefcalls.js
@BINPATH@/browser/defaults/profile/prefs.js