--- a/firefox-kde.patch Mon Jul 08 12:56:52 2019 +0200
+++ b/firefox-kde.patch Wed Jul 10 08:14:34 2019 +0200
@@ -1,11 +1,20 @@
# HG changeset patch
-# Parent 18632e53d0b0c4c03f254ca2dbbeac8f48ec6f5c
+# User msirringhaus@suse.de
+# Date 1559300151 -7200
+# Fri May 31 12:55:51 2019 +0200
+# Node ID 54d41b0033b8d649d842a1f862c6fed8b9874dec
+# Parent 428161c3b9599083e1b8710eda1760f1f707ab11
+How to apply this patch:
+1. Import and apply it
+2. cp browser/base/content/browser.xul browser/base/content/browser-kde.xul
+3. Find editBookmarkPanelDoneButton
+4. Replace #ifndef with #ifdef in the line above (this hanges the button order from Gnome-style to KDE-style)
+5. hg qrefresh
-diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
-new file mode 100644
---- /dev/null
-+++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1404 @@
+diff -r 428161c3b959 -r 54d41b0033b8 browser/base/content/browser-kde.xul
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/browser/base/content/browser-kde.xul Fri May 31 12:55:51 2019 +0200
+@@ -0,0 +1,1375 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@@ -37,7 +46,6 @@
+<?xml-stylesheet href="chrome://browser/skin/searchbar.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css" type="text/css"?>
-+<?xml-stylesheet href="chrome://browser/skin/compacttheme.css" type="text/css" alternate="yes" title="Light/Dark"?>
+
+# All DTD information is stored in a separate file so that it can be shared by
+# hiddenWindow.xul.
@@ -89,10 +97,9 @@
+# that they can be shared with macWindow.inc.xul.
+#include global-scripts.inc
+
-+<script type="application/javascript">
++<script>
+ Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js", this);
+ Services.scriptloader.loadSubScript("chrome://browser/content/browser-captivePortal.js", this);
-+ Services.scriptloader.loadSubScript("chrome://browser/content/browser-compacttheme.js", this);
+ Services.scriptloader.loadSubScript("chrome://browser/content/browser-contentblocking.js", this);
+#ifdef MOZ_DATA_REPORTING
+ Services.scriptloader.loadSubScript("chrome://browser/content/browser-data-submission-info-bar.js", this);
@@ -133,69 +140,52 @@
+ <menupopup id="tabContextMenu"
+ onpopupshowing="if (event.target == this) TabContextMenu.updateContextMenu(this);"
+ onpopuphidden="if (event.target == this) TabContextMenu.contextTab = null;">
-+ <menuitem id="context_reloadTab" label="&reloadTab.label;" accesskey="&reloadTab.accesskey;"
++ <menuitem id="context_reloadTab" data-lazy-l10n-id="reload-tab"
+ oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/>
-+ <menuitem id="context_reloadSelectedTabs" label="&reloadTabs.label;" hidden="true"
-+ accesskey="&reloadTabs.accesskey;"
++ <menuitem id="context_reloadSelectedTabs" data-lazy-l10n-id="reload-tabs" hidden="true"
+ oncommand="gBrowser.reloadMultiSelectedTabs();"/>
+ <menuitem id="context_toggleMuteTab" oncommand="TabContextMenu.contextTab.toggleMuteAudio();"/>
+ <menuitem id="context_toggleMuteSelectedTabs" hidden="true"
+ oncommand="gBrowser.toggleMuteAudioOnMultiSelectedTabs(TabContextMenu.contextTab);"/>
-+ <menuitem id="context_pinTab" label="&pinTab.label;"
-+ accesskey="&pinTab.accesskey;"
++ <menuitem id="context_pinTab" data-lazy-l10n-id="pin-tab"
+ oncommand="gBrowser.pinTab(TabContextMenu.contextTab);"/>
-+ <menuitem id="context_unpinTab" label="&unpinTab.label;" hidden="true"
-+ accesskey="&unpinTab.accesskey;"
++ <menuitem id="context_unpinTab" data-lazy-l10n-id="unpin-tab" hidden="true"
+ oncommand="gBrowser.unpinTab(TabContextMenu.contextTab);"/>
-+ <menuitem id="context_pinSelectedTabs" label="&pinSelectedTabs.label;" hidden="true"
-+ accesskey="&pinSelectedTabs.accesskey;"
++ <menuitem id="context_pinSelectedTabs" data-lazy-l10n-id="pin-selected-tabs" hidden="true"
+ oncommand="gBrowser.pinMultiSelectedTabs();"/>
-+ <menuitem id="context_unpinSelectedTabs" label="&unpinSelectedTabs.label;" hidden="true"
-+ accesskey="&unpinSelectedTabs.accesskey;"
++ <menuitem id="context_unpinSelectedTabs" data-lazy-l10n-id="unpin-selected-tabs" hidden="true"
+ oncommand="gBrowser.unpinMultiSelectedTabs();"/>
-+ <menuitem id="context_duplicateTab" label="&duplicateTab.label;"
-+ accesskey="&duplicateTab.accesskey;"
++ <menuitem id="context_duplicateTab" data-lazy-l10n-id="duplicate-tab"
+ oncommand="duplicateTabIn(TabContextMenu.contextTab, 'tab');"/>
-+ <menuitem id="context_duplicateTabs" label="&duplicateTabs.label;"
-+ accesskey="&duplicateTabs.accesskey;"
++ <menuitem id="context_duplicateTabs" data-lazy-l10n-id="duplicate-tabs"
+ oncommand="TabContextMenu.duplicateSelectedTabs();"/>
+ <menuseparator/>
-+ <menuitem id="context_selectAllTabs" label="&selectAllTabs.label;" accesskey="&selectAllTabs.accesskey;"
++ <menuitem id="context_selectAllTabs" data-lazy-l10n-id="select-all-tabs"
+ oncommand="gBrowser.selectAllTabs();"/>
+ <menuitem id="context_bookmarkSelectedTabs"
+ hidden="true"
-+ label="&bookmarkSelectedTabs.label;"
-+ accesskey="&bookmarkSelectedTabs.accesskey;"
++ data-lazy-l10n-id="bookmark-selected-tabs"
+ oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueSelectedPages);"/>
+ <menuitem id="context_bookmarkTab"
-+ label="&bookmarkTab.label;"
-+ accesskey="&bookmarkTab.accesskey;"
++ data-lazy-l10n-id="bookmark-tab"
+ oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.getUniquePages([TabContextMenu.contextTab]));"/>
+ <menu id="context_reopenInContainer"
-+ label="&reopenInContainer.label;"
-+ accesskey="&reopenInContainer.accesskey;"
++ data-lazy-l10n-id="reopen-in-container"
+ hidden="true">
+ <menupopup oncommand="TabContextMenu.reopenInContainer(event);"
+ onpopupshowing="TabContextMenu.createReopenInContainerMenu(event);"/>
+ </menu>
-+ <menu id="context_moveTabOptions"
-+ multiselectcontextlabel="&moveSelectedTabOptions.label;"
-+ multiselectcontextaccesskey="&moveSelectedTabOptions.accesskey;"
-+ nonmultiselectcontextlabel="&moveTabOptions.label;"
-+ nonmultiselectcontextaccesskey="&moveTabOptions.accesskey;">
++ <menu id="context_moveTabOptions">
+ <menupopup id="moveTabOptionsMenu">
+ <menuitem id="context_moveToStart"
-+ label="&moveToStart.label;"
-+ accesskey="&moveToStart.accesskey;"
++ data-lazy-l10n-id="move-to-start"
+ tbattr="tabbrowser-multiple"
+ oncommand="gBrowser.moveTabsToStart(TabContextMenu.contextTab);"/>
+ <menuitem id="context_moveToEnd"
-+ label="&moveToEnd.label;"
-+ accesskey="&moveToEnd.accesskey;"
++ data-lazy-l10n-id="move-to-end"
+ tbattr="tabbrowser-multiple"
+ oncommand="gBrowser.moveTabsToEnd(TabContextMenu.contextTab);"/>
-+ <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;"
-+ accesskey="&moveToNewWindow.accesskey;"
++ <menuitem id="context_openTabInWindow" data-lazy-l10n-id="move-to-new-window"
+ tbattr="tabbrowser-multiple"
+ oncommand="gBrowser.replaceTabsWithWindow(TabContextMenu.contextTab);"/>
+ </menupopup>
@@ -206,18 +196,17 @@
+ onpopupshowing="gSync.populateSendTabToDevicesMenu(event.target, TabContextMenu.contextTab.linkedBrowser.currentURI.spec, TabContextMenu.contextTab.linkedBrowser.contentTitle, TabContextMenu.contextTab.multiselected);"/>
+ </menu>
+ <menuseparator/>
-+ <menuitem id="context_closeTabsToTheEnd" label="&closeTabsToTheEnd.label;" accesskey="&closeTabsToTheEnd.accesskey;"
++ <menuitem id="context_closeTabsToTheEnd" data-lazy-l10n-id="close-tabs-to-the-end"
+ oncommand="gBrowser.removeTabsToTheEndFrom(TabContextMenu.contextTab, {animate: true});"/>
-+ <menuitem id="context_closeOtherTabs" label="&closeOtherTabs.label;" accesskey="&closeOtherTabs.accesskey;"
++ <menuitem id="context_closeOtherTabs" data-lazy-l10n-id="close-other-tabs"
+ oncommand="gBrowser.removeAllTabsBut(TabContextMenu.contextTab);"/>
+ <menuitem id="context_undoCloseTab"
-+ label="&undoCloseTab.label;"
-+ accesskey="&undoCloseTab.accesskey;"
++ data-lazy-l10n-id="undo-close-tab"
+ observes="History:UndoCloseTab"/>
-+ <menuitem id="context_closeTab" label="&closeTab.label;" accesskey="&closeTab.accesskey;"
++ <menuitem id="context_closeTab" data-lazy-l10n-id="close-tab"
+ oncommand="gBrowser.removeTab(TabContextMenu.contextTab, { animate: true });"/>
-+ <menuitem id="context_closeSelectedTabs" label="&closeTabs.label;"
-+ hidden="true" accesskey="&closeTabs.accesskey;"
++ <menuitem id="context_closeSelectedTabs" data-lazy-l10n-id="close-tabs"
++ hidden="true"
+ oncommand="gBrowser.removeMultiSelectedTabs();"/>
+ </menupopup>
+
@@ -301,11 +290,17 @@
+ aria-labelledby="editBookmarkPanelTitle">
+ <box class="panel-header">
+ <label id="editBookmarkPanelTitle"/>
++ <toolbarbutton id="editBookmarkPanelInfoButton" oncommand="StarUI.toggleRecommendation();" >
++ <image/>
++ </toolbarbutton>
+ </box>
-+ <html:div id="editBookmarkPanelFaviconContainer">
-+ <html:img id="editBookmarkPanelFavicon"/>
++ <html:div id="editBookmarkPanelInfoArea">
++ <html:div id="editBookmarkPanelRecommendation"></html:div>
++ <html:div id="editBookmarkPanelFaviconContainer">
++ <html:img id="editBookmarkPanelFavicon"/>
++ </html:div>
++ <html:div id="editBookmarkPanelImage"></html:div>
+ </html:div>
-+ <box id="editBookmarkPanelImage"/>
+#include ../../components/places/content/editBookmarkPanel.inc.xul
+ <vbox id="editBookmarkPanelBottomContent"
+ flex="1">
@@ -424,6 +419,11 @@
+ label="&customizeMenu.removeExtension.label;"
+ contexttype="toolbaritem"
+ class="customize-context-removeExtension"/>
++ <menuitem oncommand="ToolbarContextMenu.reportExtensionForContextAction(this.parentElement, 'toolbar_context_menu')"
++ accesskey="&customizeMenu.reportExtension.accesskey;"
++ label="&customizeMenu.reportExtension.label;"
++ contexttype="toolbaritem"
++ class="customize-context-reportExtension"/>
+ <menuseparator/>
+ <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"
+ accesskey="&customizeMenu.pinToOverflowMenu.accesskey;"
@@ -444,32 +444,26 @@
+ <menuitem id="toolbar-context-reloadSelectedTab"
+ contexttype="tabbar"
+ oncommand="gBrowser.reloadMultiSelectedTabs();"
-+ label="&toolbarContextMenu.reloadSelectedTab.label;"
-+ accesskey="&toolbarContextMenu.reloadSelectedTab.accesskey;"/>
++ data-lazy-l10n-id="toolbar-context-menu-reload-selected-tab"/>
+ <menuitem id="toolbar-context-reloadSelectedTabs"
+ contexttype="tabbar"
+ oncommand="gBrowser.reloadMultiSelectedTabs();"
-+ label="&toolbarContextMenu.reloadSelectedTabs.label;"
-+ accesskey="&toolbarContextMenu.reloadSelectedTabs.accesskey;"/>
++ data-lazy-l10n-id="toolbar-context-menu-reload-selected-tabs"/>
+ <menuitem id="toolbar-context-bookmarkSelectedTab"
+ contexttype="tabbar"
+ oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueSelectedPages);"
-+ label="&toolbarContextMenu.bookmarkSelectedTab.label;"
-+ accesskey="&toolbarContextMenu.bookmarkSelectedTab.accesskey;"/>
++ data-lazy-l10n-id="toolbar-context-menu-bookmark-selected-tab"/>
+ <menuitem id="toolbar-context-bookmarkSelectedTabs"
+ contexttype="tabbar"
+ oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueSelectedPages);"
-+ label="&toolbarContextMenu.bookmarkSelectedTabs.label;"
-+ accesskey="&toolbarContextMenu.bookmarkSelectedTabs.accesskey;"/>
++ data-lazy-l10n-id="toolbar-context-menu-bookmark-selected-tabs"/>
+ <menuitem id="toolbar-context-selectAllTabs"
+ contexttype="tabbar"
+ oncommand="gBrowser.selectAllTabs();"
-+ label="&toolbarContextMenu.selectAllTabs.label;"
-+ accesskey="&toolbarContextMenu.selectAllTabs.accesskey;"/>
++ data-lazy-l10n-id="toolbar-context-menu-select-all-tabs"/>
+ <menuitem id="toolbar-context-undoCloseTab"
+ contexttype="tabbar"
-+ label="&toolbarContextMenu.undoCloseTab.label;"
-+ accesskey="&toolbarContextMenu.undoCloseTab.accesskey;"
++ data-lazy-l10n-id="toolbar-context-menu-undo-close-tab"
+ observes="History:UndoCloseTab"/>
+ <menuseparator/>
+ <menuseparator id="viewToolbarsMenuSeparator"/>
@@ -631,7 +625,8 @@
+#include popup-notifications.inc
+
+#include ../../components/customizableui/content/panelUI.inc.xul
-+#include ../../components/controlcenter/content/panel.inc.xul
++#include ../../components/controlcenter/content/identityPanel.inc.xul
++#include ../../components/controlcenter/content/protectionsPanel.inc.xul
+#include ../../components/downloads/content/downloadsPanel.inc.xul
+#include browser-allTabsMenu.inc.xul
+
@@ -645,31 +640,23 @@
+ onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/>
+
+ <menupopup id="SyncedTabsSidebarContext">
-+ <menuitem label="&syncedTabs.context.open.label;"
-+ accesskey="&syncedTabs.context.open.accesskey;"
++ <menuitem data-lazy-l10n-id="synced-tabs-context-open"
+ id="syncedTabsOpenSelected" where="current"/>
-+ <menuitem label="&syncedTabs.context.openInNewTab.label;"
-+ accesskey="&syncedTabs.context.openInNewTab.accesskey;"
++ <menuitem data-lazy-l10n-id="synced-tabs-context-open-in-new-tab"
+ id="syncedTabsOpenSelectedInTab" where="tab"/>
-+ <menuitem label="&syncedTabs.context.openInNewWindow.label;"
-+ accesskey="&syncedTabs.context.openInNewWindow.accesskey;"
++ <menuitem data-lazy-l10n-id="synced-tabs-context-open-in-new-window"
+ id="syncedTabsOpenSelectedInWindow" where="window"/>
-+ <menuitem label="&syncedTabs.context.openInNewPrivateWindow.label;"
-+ accesskey="&syncedTabs.context.openInNewPrivateWindow.accesskey;"
++ <menuitem data-lazy-l10n-id="synced-tabs-context-open-in-new-private-window"
+ id="syncedTabsOpenSelectedInPrivateWindow" where="window" private="true"/>
+ <menuseparator/>
-+ <menuitem label="&syncedTabs.context.bookmarkSingleTab.label;"
-+ accesskey="&syncedTabs.context.bookmarkSingleTab.accesskey;"
++ <menuitem data-lazy-l10n-id="synced-tabs-context-bookmark-single-tab"
+ id="syncedTabsBookmarkSelected"/>
-+ <menuitem label="&syncedTabs.context.copy.label;"
-+ accesskey="&syncedTabs.context.copy.accesskey;"
++ <menuitem data-lazy-l10n-id="synced-tabs-context-copy"
+ id="syncedTabsCopySelected"/>
+ <menuseparator/>
-+ <menuitem label="&syncedTabs.context.openAllInTabs.label;"
-+ accesskey="&syncedTabs.context.openAllInTabs.accesskey;"
++ <menuitem data-lazy-l10n-id="synced-tabs-context-open-all-in-tabs"
+ id="syncedTabsOpenAllInTabs"/>
-+ <menuitem label="&syncedTabs.context.managedevices.label;"
-+ accesskey="&syncedTabs.context.managedevices.accesskey;"
++ <menuitem data-lazy-l10n-id="synced-tabs-context-manage-devices"
+ id="syncedTabsManageDevices"
+ oncommand="gSync.openDevicesManagementPage('syncedtabs-sidebar');"/>
+ <menuitem label="&syncSyncNowItem.label;"
@@ -704,7 +691,7 @@
+ id="syncedTabsRefreshFilter"/>
+ </menupopup>
+
-+ <hbox id="statuspanel" inactive="true" layer="true">
++ <hbox id="statuspanel" inactive="true" renderroot="content">
+ <hbox id="statuspanel-inner">
+ <label id="statuspanel-label"
+ role="status"
@@ -876,16 +863,6 @@
+ placeholder="&urlbar.placeholder2;"
+ defaultPlaceholder="&urlbar.placeholder2;"
+ focused="true"
-+ type="autocomplete"
-+ quantumbar="false"
-+ autocompletesearch="unifiedcomplete"
-+ autocompletesearchparam="enable-actions"
-+ autocompletepopup="PopupAutoCompleteRichResult"
-+ completeselectedindex="true"
-+ tabscrolling="true"
-+ newlines="stripsurroundingwhitespace"
-+ ontextentered="this.handleCommand(param);"
-+ ontextreverted="return this.handleRevert();"
+ pageproxystate="invalid">
+ <!-- Use onclick instead of normal popup= syntax since the popup
+ code fires onmousedown, and hence eats our favicon drag events. -->
@@ -928,6 +905,8 @@
+ tooltiptext="&urlbar.flashPluginBlocked.tooltip;"/>
+ <image data-permission-id="midi" class="blocked-permission-icon midi-icon" role="button"
+ tooltiptext="&urlbar.midiBlocked.tooltip;"/>
++ <image data-permission-id="install" class="blocked-permission-icon install-icon" role="button"
++ tooltiptext="&urlbar.installBlocked.tooltip;"/>
+ </box>
+ <box id="notification-popup-box"
+ hidden="true"
@@ -1339,7 +1318,7 @@
+
+ <hbox id="fullscr-toggler" hidden="true"/>
+
-+ <deck id="content-deck" flex="1">
++ <deck id="content-deck" flex="1" renderroot="content">
+ <hbox flex="1" id="browser">
+ <vbox id="browser-border-start" hidden="true" layer="true"/>
+ <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
@@ -1372,10 +1351,12 @@
+ </vbox>
+ <vbox id="browser-border-end" hidden="true" layer="true"/>
+ </hbox>
++ <box id="customization-container" flex="1" hidden="true"><![CDATA[
+#include ../../components/customizableui/content/customizeMode.inc.xul
++ ]]></box>
+ </deck>
+
-+ <html:div id="fullscreen-warning" class="pointerlockfswarning" hidden="true">
++ <html:div id="fullscreen-warning" class="pointerlockfswarning" hidden="true" renderroot="content">
+ <html:div class="pointerlockfswarning-domain-text">
+ &fullscreenWarning.beforeDomain.label;
+ <html:span class="pointerlockfswarning-domain"/>
@@ -1394,7 +1375,7 @@
+ </html:button>
+ </html:div>
+
-+ <html:div id="pointerlock-warning" class="pointerlockfswarning" hidden="true">
++ <html:div id="pointerlock-warning" class="pointerlockfswarning" hidden="true" renderroot="content">
+ <html:div class="pointerlockfswarning-domain-text">
+ &pointerlockWarning.beforeDomain.label;
+ <html:span class="pointerlockfswarning-domain"/>
@@ -1405,42 +1386,26 @@
+ </html:div>
+ </html:div>
+
-+ <vbox id="browser-bottombox" layer="true">
++ <vbox id="browser-bottombox" layer="true" renderroot="content">
+ <!-- gNotificationBox will be added here lazily. -->
+ </vbox>
-+
+</window>
-diff --git a/browser/base/jar.mn b/browser/base/jar.mn
---- a/browser/base/jar.mn
-+++ b/browser/base/jar.mn
-@@ -28,16 +28,18 @@ browser.jar:
- content/browser/aboutTabCrashed.js (content/aboutTabCrashed.js)
- content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml)
- * content/browser/browser.css (content/browser.css)
- content/browser/browser.js (content/browser.js)
- #ifdef MOZ_BROWSER_XHTML
- * content/browser/browser.xhtml (content/browser.xhtml)
+diff -r 428161c3b959 -r 54d41b0033b8 browser/base/jar.mn
+--- a/browser/base/jar.mn Mon Jun 17 09:02:06 2019 +0200
++++ b/browser/base/jar.mn Fri May 31 12:55:51 2019 +0200
+@@ -33,6 +33,8 @@
+ #else
+ * content/browser/browser.xul (content/browser.xul)
#endif
- * content/browser/browser.xul (content/browser.xul)
+* content/browser/browser-kde.xul (content/browser-kde.xul)
+% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde
content/browser/browser-addons.js (content/browser-addons.js)
content/browser/browser-allTabsMenu.js (content/browser-allTabsMenu.js)
content/browser/browser-captivePortal.js (content/browser-captivePortal.js)
- content/browser/browser-ctrlTab.js (content/browser-ctrlTab.js)
- content/browser/browser-customization.js (content/browser-customization.js)
- content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js)
- content/browser/browser-compacttheme.js (content/browser-compacttheme.js)
- content/browser/browser-contentblocking.js (content/browser-contentblocking.js)
-diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
---- a/browser/components/preferences/in-content/main.js
-+++ b/browser/components/preferences/in-content/main.js
-@@ -288,16 +288,23 @@ var gMainPane = {
- this._backoffIndex++ : backoffTimes.length - 1]);
- };
-
- window.setTimeout(() => {
- window.requestIdleCallback(pollForDefaultBrowser);
+diff -r 428161c3b959 -r 54d41b0033b8 browser/components/preferences/in-content/main.js
+--- a/browser/components/preferences/in-content/main.js Mon Jun 17 09:02:06 2019 +0200
++++ b/browser/components/preferences/in-content/main.js Fri May 31 12:55:51 2019 +0200
+@@ -294,6 +294,13 @@
}, backoffTimes[this._backoffIndex]);
}
@@ -1454,17 +1419,7 @@
this.initBrowserContainers();
this.buildContentProcessCountMenuList();
- let performanceSettingsLink = document.getElementById("performanceSettingsLearnMore");
- let performanceSettingsUrl = Services.urlFormatter.formatURLPref("app.support.baseURL") + "performance";
- performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
-
- this.updateDefaultPerformanceSettingsPref();
-@@ -1025,16 +1032,27 @@ var gMainPane = {
- // Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser.
- this._backoffIndex = 0;
-
- let shellSvc = getShellService();
- if (!shellSvc)
+@@ -983,6 +990,17 @@
return;
try {
shellSvc.setDefaultBrowser(true, false);
@@ -1482,20 +1437,10 @@
} catch (ex) {
Cu.reportError(ex);
return;
- }
-
- let selectedIndex = shellSvc.isDefaultBrowser(false, true) ? 1 : 0;
- document.getElementById("setDefaultPane").selectedIndex = selectedIndex;
- }
-diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build
---- a/browser/components/shell/moz.build
-+++ b/browser/components/shell/moz.build
-@@ -29,16 +29,18 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
- ]
- elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
- XPIDL_SOURCES += [
- 'nsIGNOMEShellService.idl',
- ]
+diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/moz.build
+--- a/browser/components/shell/moz.build Mon Jun 17 09:02:06 2019 +0200
++++ b/browser/components/shell/moz.build Fri May 31 12:55:51 2019 +0200
+@@ -33,6 +33,8 @@
SOURCES += [
'nsGNOMEShellService.cpp',
@@ -1504,15 +1449,9 @@
]
elif CONFIG['OS_ARCH'] == 'WINNT':
SOURCES += [
- 'nsWindowsShellService.cpp',
- ]
- LOCAL_INCLUDES += [
- '../../../other-licenses/nsis/Contrib/CityHash/cityhash',
- ]
-diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components/shell/nsKDEShellService.cpp
-new file mode 100644
---- /dev/null
-+++ b/browser/components/shell/nsKDEShellService.cpp
+diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsKDEShellService.cpp
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/browser/components/shell/nsKDEShellService.cpp Fri May 31 12:55:51 2019 +0200
@@ -0,0 +1,150 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
@@ -1664,10 +1603,9 @@
+ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
+}
+
-diff --git a/browser/components/shell/nsKDEShellService.h b/browser/components/shell/nsKDEShellService.h
-new file mode 100644
---- /dev/null
-+++ b/browser/components/shell/nsKDEShellService.h
+diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsKDEShellService.h
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/browser/components/shell/nsKDEShellService.h Fri May 31 12:55:51 2019 +0200
@@ -0,0 +1,32 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
@@ -1701,10 +1639,9 @@
+};
+
+#endif // nskdeshellservice_h____
-diff --git a/browser/components/shell/nsUnixShellService.cpp b/browser/components/shell/nsUnixShellService.cpp
-new file mode 100644
---- /dev/null
-+++ b/browser/components/shell/nsUnixShellService.cpp
+diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsUnixShellService.cpp
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/browser/components/shell/nsUnixShellService.cpp Fri May 31 12:55:51 2019 +0200
@@ -0,0 +1,22 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
@@ -1728,10 +1665,9 @@
+ return nsKDEShellServiceConstructor( aOuter, aIID, aResult );
+ return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult );
+}
-diff --git a/browser/components/shell/nsUnixShellService.h b/browser/components/shell/nsUnixShellService.h
-new file mode 100644
---- /dev/null
-+++ b/browser/components/shell/nsUnixShellService.h
+diff -r 428161c3b959 -r 54d41b0033b8 browser/components/shell/nsUnixShellService.h
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/browser/components/shell/nsUnixShellService.h Fri May 31 12:55:51 2019 +0200
@@ -0,0 +1,15 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
@@ -1748,15 +1684,10 @@
+nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+
+#endif // nsunixshellservice_h____
-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
-@@ -286,16 +286,18 @@
- @RESPATH@/browser/defaults/settings/pinning
- @RESPATH@/browser/defaults/settings/main
-
- ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
- ; Technically this is an app pref file, but we are keeping it in the original
+diff -r 428161c3b959 -r 54d41b0033b8 browser/installer/package-manifest.in
+--- a/browser/installer/package-manifest.in Mon Jun 17 09:02:06 2019 +0200
++++ b/browser/installer/package-manifest.in Fri May 31 12:55:51 2019 +0200
+@@ -299,6 +299,8 @@
; gre location for now.
@RESPATH@/defaults/pref/channel-prefs.js
@@ -1765,8 +1696,3 @@
; Services (gre) prefs
@RESPATH@/defaults/pref/services-sync.js
- ; [Layout Engine Resources]
- ; Style Sheets, Graphics and other Resources used by the layout engine.
- @RESPATH@/res/EditorOverride.css
- @RESPATH@/res/contenteditable.css
- @RESPATH@/res/designmode.css