Djam/firefox-esr91
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/firefox-esr91.git synced 2025-02-25 10:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update kde patches

Browse source
This commit is contained in:
Tigro 2014-10-15 16:45:14 +04:00
parent 25af2a1f1e
commit cba1c6e911
3 changed files with 138 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

135
firefox-32-kde.patch → firefox-33-kde.patch
View file

@ -2,7 +2,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/browser/base/content/browser-kde.xul +++ b/browser/base/content/browser-kde.xul
@@ -0,0 +1,1206 @@ @@ -0,0 +1,1238 @@
+#filter substitution +#filter substitution
+<?xml version="1.0"?> +<?xml version="1.0"?>
+# -*- Mode: HTML -*- +# -*- Mode: HTML -*-
@ -181,7 +181,7 @@ new file mode 100644
+ </row> + </row>
+ <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/> + <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/>
+ <hbox id="editBookmarkPanelBottomButtons" pack="end"> + <hbox id="editBookmarkPanelBottomButtons" pack="end">
+#ifdef XP_UNIX +#ifndef XP_UNIX
+ <button id="editBookmarkPanelDoneButton" + <button id="editBookmarkPanelDoneButton"
+ class="editBookmarkPanelBottomButton" + class="editBookmarkPanelBottomButton"
+ label="&editBookmark.done.label;" + label="&editBookmark.done.label;"
@ -272,16 +272,48 @@ new file mode 100644
+ noautofocus="true" + noautofocus="true"
+ position="topcenter topright"/> + position="topcenter topright"/>
+ +
+ <panel id="loop-notification-panel"
+ class="loop-panel social-panel"
+ type="arrow"
+ hidden="true"
+ noautofocus="true"/>
+
+ <panel id="loop-panel"
+ class="loop-panel social-panel"
+ type="arrow"
+ orient="horizontal"
+ hidden="true"/>
+
+ <menupopup id="toolbar-context-menu" + <menupopup id="toolbar-context-menu"
+ onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));"> + onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));">
+ <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)" + <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"
+ accesskey="&customizeMenu.moveToPanel.accesskey;" + accesskey="&customizeMenu.moveToPanel.accesskey;"
+ label="&customizeMenu.moveToPanel.label;" + label="&customizeMenu.moveToPanel.label;"
+ contexttype="toolbaritem"
+ class="customize-context-moveToPanel"/> + class="customize-context-moveToPanel"/>
+ <menuitem oncommand="gCustomizeMode.removeFromArea(document.popupNode)" + <menuitem oncommand="gCustomizeMode.removeFromArea(document.popupNode)"
+ accesskey="&customizeMenu.removeFromToolbar.accesskey;" + accesskey="&customizeMenu.removeFromToolbar.accesskey;"
+ label="&customizeMenu.removeFromToolbar.label;" + label="&customizeMenu.removeFromToolbar.label;"
+ contexttype="toolbaritem"
+ class="customize-context-removeFromToolbar"/> + class="customize-context-removeFromToolbar"/>
+ <menuitem id="toolbar-context-reloadAllTabs"
+ class="toolbaritem-tabsmenu"
+ contexttype="tabbar"
+ oncommand="gBrowser.reloadAllTabs();"
+ label="&toolbarContextMenu.reloadAllTabs.label;"
+ accesskey="&toolbarContextMenu.reloadAllTabs.accesskey;"/>
+ <menuitem id="toolbar-context-bookmarkAllTabs"
+ class="toolbaritem-tabsmenu"
+ contexttype="tabbar"
+ command="Browser:BookmarkAllTabs"
+ label="&toolbarContextMenu.bookmarkAllTabs.label;"
+ accesskey="&toolbarContextMenu.bookmarkAllTabs.accesskey;"/>
+ <menuitem id="toolbar-context-undoCloseTab"
+ class="toolbaritem-tabsmenu"
+ contexttype="tabbar"
+ label="&toolbarContextMenu.undoCloseTab.label;"
+ accesskey="&toolbarContextMenu.undoCloseTab.accesskey;"
+ observes="History:UndoCloseTab"/>
+ <menuseparator/> + <menuseparator/>
+ <menuseparator id="viewToolbarsMenuSeparator"/> + <menuseparator id="viewToolbarsMenuSeparator"/>
+ <!-- XXXgijs: we're using oncommand handler here to avoid the event being + <!-- XXXgijs: we're using oncommand handler here to avoid the event being
@ -536,8 +568,7 @@ new file mode 100644
+#endif +#endif
+#endif +#endif
+ context="toolbar-context-menu"> + context="toolbar-context-menu">
+ <toolbaritem id="menubar-items" align="center" + <toolbaritem id="menubar-items" align="center">
+ cui-areatype="toolbar">
+# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by +# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by
+# hiddenWindow.xul. +# hiddenWindow.xul.
+#include browser-menubar.inc +#include browser-menubar.inc
@ -574,7 +605,6 @@ new file mode 100644
+ flex="1" + flex="1"
+ setfocus="false" + setfocus="false"
+ tooltip="tabbrowser-tab-tooltip" + tooltip="tabbrowser-tab-tooltip"
+ cui-areatype="toolbar"
+ stopwatchid="FX_TAB_CLICK_MS"> + stopwatchid="FX_TAB_CLICK_MS">
+ <tab class="tabbrowser-tab" selected="true" fadein="true"/> + <tab class="tabbrowser-tab" selected="true" fadein="true"/>
+ </tabs> + </tabs>
@ -605,8 +635,12 @@ new file mode 100644
+ key="key_tabview" + key="key_tabview"
+ label="&viewTabGroups.label;" + label="&viewTabGroups.label;"
+ command="Browser:ToggleTabView" + command="Browser:ToggleTabView"
+ cui-areatype="toolbar"
+ observes="tabviewGroupsNumber"/> + observes="tabviewGroupsNumber"/>
+ <menuitem id="alltabs_undoCloseTab"
+ class="menuitem-iconic"
+ key="key_undoCloseTab"
+ label="&undoCloseTab.label;"
+ observes="History:UndoCloseTab"/>
+ <menuseparator id="alltabs-popup-separator"/> + <menuseparator id="alltabs-popup-separator"/>
+ </menupopup> + </menupopup>
+ </toolbarbutton> + </toolbarbutton>
@ -640,7 +674,7 @@ new file mode 100644
+ aria-label="&navbarCmd.label;" + aria-label="&navbarCmd.label;"
+ fullscreentoolbar="true" mode="icons" customizable="true" + fullscreentoolbar="true" mode="icons" customizable="true"
+ iconsize="small" + iconsize="small"
+ defaultset="urlbar-container,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,social-share-button,social-toolbar-item" + defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,loop-call-button,social-share-button,social-toolbar-item"
+ customizationtarget="nav-bar-customization-target" + customizationtarget="nav-bar-customization-target"
+ overflowable="true" + overflowable="true"
+ overflowbutton="nav-bar-overflow-button" + overflowbutton="nav-bar-overflow-button"
@ -651,12 +685,10 @@ new file mode 100644
+ <hbox id="nav-bar-customization-target" flex="1"> + <hbox id="nav-bar-customization-target" flex="1">
+ <toolbaritem id="urlbar-container" flex="400" persist="width" + <toolbaritem id="urlbar-container" flex="400" persist="width"
+ title="&locationItem.title;" removable="false" + title="&locationItem.title;" removable="false"
+ cui-areatype="toolbar"
+ class="chromeclass-location" overflows="false"> + class="chromeclass-location" overflows="false">
+ <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ label="&backCmd.label;" + label="&backCmd.label;"
+ command="Browser:BackOrBackDuplicate" + command="Browser:BackOrBackDuplicate"
+ cui-areatype="toolbar"
+ onclick="checkForMiddleClick(this, event);" + onclick="checkForMiddleClick(this, event);"
+ tooltip="back-button-tooltip" + tooltip="back-button-tooltip"
+ context="backForwardMenu"/> + context="backForwardMenu"/>
@ -664,7 +696,6 @@ new file mode 100644
+ <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ label="&forwardCmd.label;" + label="&forwardCmd.label;"
+ command="Browser:ForwardOrForwardDuplicate" + command="Browser:ForwardOrForwardDuplicate"
+ cui-areatype="toolbar"
+ onclick="checkForMiddleClick(this, event);" + onclick="checkForMiddleClick(this, event);"
+ tooltip="forward-button-tooltip" + tooltip="forward-button-tooltip"
+ context="backForwardMenu"/> + context="backForwardMenu"/>
@ -703,6 +734,8 @@ new file mode 100644
+ <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="webRTC-sharingMicrophone-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="webRTC-sharingMicrophone-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="webRTC-shareScreen-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="webRTC-sharingScreen-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="translate-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="translate-notification-icon" class="notification-anchor-icon" role="button"/>
@ -718,6 +751,7 @@ new file mode 100644
+ onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);" + onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
+ ondragstart="gIdentityHandler.onDragStart(event);"> + ondragstart="gIdentityHandler.onDragStart(event);">
+ <image id="page-proxy-favicon" + <image id="page-proxy-favicon"
+ consumeanchor="identity-box"
+ onclick="PageProxyClickHandler(event);" + onclick="PageProxyClickHandler(event);"
+ pageproxystate="invalid"/> + pageproxystate="invalid"/>
+ <hbox id="identity-icon-labels"> + <hbox id="identity-icon-labels">
@ -759,20 +793,6 @@ new file mode 100644
+ <searchbar id="searchbar" flex="1"/> + <searchbar id="searchbar" flex="1"/>
+ </toolbaritem> + </toolbaritem>
+ +
+ <toolbarbutton id="webrtc-status-button"
+ class="toolbarbutton-1 chromeclass-toolbar-additional"
+ type="menu"
+ hidden="true"
+ orient="horizontal"
+ label="&webrtcIndicatorButton.label;"
+ tooltiptext="&webrtcIndicatorButton.tooltip;"
+ cui-areatype="toolbar"
+ overflows="false">
+ <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);"
+ onpopuphiding="WebrtcIndicator.clearPopup(this);"
+ oncommand="WebrtcIndicator.menuCommand(event.target);"/>
+ </toolbarbutton>
+
+ <toolbarbutton id="bookmarks-menu-button" + <toolbarbutton id="bookmarks-menu-button"
+ class="toolbarbutton-1 chromeclass-toolbar-additional" + class="toolbarbutton-1 chromeclass-toolbar-additional"
+ persist="class" + persist="class"
@ -902,6 +922,21 @@ new file mode 100644
+ cui-areatype="toolbar" + cui-areatype="toolbar"
+ aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> + aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
+ +
+ <!-- XXX Bug 1013989 will provide a label for the button -->
+ <!-- This uses badged to be compatible with the social api code it shares.
+ We may also want it to be badged in the future, for notification
+ purposes. -->
+ <toolbarbutton id="loop-call-button"
+ class="toolbarbutton-1 chromeclass-toolbar-additional"
+ persist="class"
+ type="badged"
+ removable="true"
+ tooltiptext="&loopCallButton.tooltip;"
+ oncommand="LoopUI.openCallPanel(event);"
+ cui-areatype="toolbar"
+ >
+ </toolbarbutton>
+
+ +
+ <toolbarbutton id="social-share-button" + <toolbarbutton id="social-share-button"
+ class="toolbarbutton-1 chromeclass-toolbar-additional" + class="toolbarbutton-1 chromeclass-toolbar-additional"
@ -915,17 +950,15 @@ new file mode 100644
+ +
+ <toolbarbutton id="nav-bar-overflow-button" + <toolbarbutton id="nav-bar-overflow-button"
+ class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button" + class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button"
+ cui-areatype="toolbar"
+ skipintoolbarset="true" + skipintoolbarset="true"
+ tooltiptext="&navbarOverflow.label;"/> + tooltiptext="&navbarOverflow.label;"/>
+ +
+ <toolbaritem id="PanelUI-button" + <toolbaritem id="PanelUI-button"
+ class="chromeclass-toolbar-additional" + class="chromeclass-toolbar-additional"
+ cui-areatype="toolbar"
+ removable="false"> + removable="false">
+ <toolbarbutton id="PanelUI-menu-button" + <toolbarbutton id="PanelUI-menu-button"
+ class="toolbarbutton-1" + class="toolbarbutton-1"
+ cui-areatype="toolbar" + consumeanchor="PanelUI-button"
+ label="&brandShortName;" + label="&brandShortName;"
+ tooltiptext="&appmenu.tooltip;"/> + tooltiptext="&appmenu.tooltip;"/>
+ </toolbaritem> + </toolbaritem>
@ -941,7 +974,6 @@ new file mode 100644
+# Prior to 10.7 there wasn't a native fullscreen button so we use #restore-button +# Prior to 10.7 there wasn't a native fullscreen button so we use #restore-button
+# to exit fullscreen and want it to behave like other toolbar buttons. +# to exit fullscreen and want it to behave like other toolbar buttons.
+ class="toolbarbutton-1" + class="toolbarbutton-1"
+ cui-areatype="toolbar"
+#endif +#endif
+ tooltiptext="&fullScreenRestore.tooltip;" + tooltiptext="&fullScreenRestore.tooltip;"
+ oncommand="BrowserFullScreen();"/> + oncommand="BrowserFullScreen();"/>
@ -1142,7 +1174,7 @@ new file mode 100644
+ <description class="full-screen-description" value="&fullscreenExitHint2.value;"/> + <description class="full-screen-description" value="&fullscreenExitHint2.value;"/>
+ <vbox id="full-screen-approval-pane" align="center"> + <vbox id="full-screen-approval-pane" align="center">
+ <hbox> + <hbox>
+#ifndef XP_UNIX +#ifdef XP_UNIX
+ <button label="&fullscreenExitButton.label;" + <button label="&fullscreenExitButton.label;"
+ oncommand="FullScreen.setFullscreenAllowed(false);" + oncommand="FullScreen.setFullscreenAllowed(false);"
+ class="full-screen-approval-button"/> + class="full-screen-approval-button"/>
@ -1209,6 +1241,47 @@ new file mode 100644
+</deck> +</deck>
+ +
+</window> +</window>
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -171,17 +171,17 @@
class="editBookmarkPanelHeaderButton"
oncommand="StarUI.removeBookmarkButtonCommand();"
accesskey="&editBookmark.removeBookmark.accessKey;"/>
</hbox>
</vbox>
</row>
<vbox id="editBookmarkPanelContent" flex="1" hidden="true"/>
<hbox id="editBookmarkPanelBottomButtons" pack="end">
-#ifndef XP_UNIX
+#ifdef XP_UNIX
<button id="editBookmarkPanelDoneButton"
class="editBookmarkPanelBottomButton"
label="&editBookmark.done.label;"
default="true"
oncommand="StarUI.panel.hidePopup();"/>
<button id="editBookmarkPanelDeleteButton"
class="editBookmarkPanelBottomButton"
label="&editBookmark.cancel.label;"
@@ -1164,17 +1164,17 @@
<hbox id="full-screen-warning-container" hidden="true" fadeout="true">
<hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
<vbox id="full-screen-warning-message" align="center">
<description id="full-screen-domain-text"/>
<description class="full-screen-description" value="&fullscreenExitHint2.value;"/>
<vbox id="full-screen-approval-pane" align="center">
<hbox>
-#ifdef XP_UNIX
+#ifndef XP_UNIX
<button label="&fullscreenExitButton.label;"
oncommand="FullScreen.setFullscreenAllowed(false);"
class="full-screen-approval-button"/>
<button label="&fullscreenAllowButton.label;"
oncommand="FullScreen.setFullscreenAllowed(true);"
class="full-screen-approval-button"/>
#else
<button label="&fullscreenAllowButton.label;"
diff --git a/browser/base/jar.mn b/browser/base/jar.mn diff --git a/browser/base/jar.mn b/browser/base/jar.mn
--- a/browser/base/jar.mn --- a/browser/base/jar.mn
+++ b/browser/base/jar.mn +++ b/browser/base/jar.mn
@ -1317,7 +1390,7 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/pre
// when the user will select the default. We refresh here periodically // when the user will select the default. We refresh here periodically
// in case the default changes. On other Windows OS's defaults can also // in case the default changes. On other Windows OS's defaults can also
// be set while the prefs are open. // be set while the prefs are open.
@@ -875,14 +881,25 @@ var gAdvancedPane = { @@ -889,14 +895,25 @@ var gAdvancedPane = {
* Set browser as the operating system default browser. * Set browser as the operating system default browser.
*/ */
setDefaultBrowser: function() setDefaultBrowser: function()
@ -1799,7 +1872,7 @@ new file mode 100644
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in
@@ -666,19 +666,21 @@ @@ -658,19 +658,21 @@
@BINPATH@/defaults/autoconfig/prefcalls.js @BINPATH@/defaults/autoconfig/prefcalls.js
@BINPATH@/browser/defaults/profile/prefs.js @BINPATH@/browser/defaults/profile/prefs.js

4
firefox.spec
View file

@ -52,8 +52,8 @@ Patch2: firefox-vendor.patch
Patch8: firefox-25.0-disable-check-default-browser.patch Patch8: firefox-25.0-disable-check-default-browser.patch
Patch10: firefox-3.5.3-default-mail-handler.patch Patch10: firefox-3.5.3-default-mail-handler.patch
# Patches for kde integration of FF # Patches for kde integration of FF
Patch11: firefox-32-kde.patch Patch11: firefox-33-kde.patch
Patch12: mozilla-32-kde.patch Patch12: mozilla-33-kde.patch
Patch13: mozilla-kde-background.patch Patch13: mozilla-kde-background.patch
Patch34: xulrunner_nojit.patch Patch34: xulrunner_nojit.patch

41
mozilla-32-kde.patch → mozilla-33-kde.patch
View file

@ -44,7 +44,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
#include "prefread.h" #include "prefread.h"
#include "prefapi_private_data.h" #include "prefapi_private_data.h"
@@ -1134,16 +1135,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char @@ -1167,16 +1168,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
static nsresult pref_LoadPrefsInDirList(const char *listId) static nsresult pref_LoadPrefsInDirList(const char *listId)
{ {
@ -79,7 +79,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
return NS_OK; return NS_OK;
bool hasMore; bool hasMore;
@@ -1159,17 +1178,17 @@ static nsresult pref_LoadPrefsInDirList( @@ -1192,17 +1211,17 @@ static nsresult pref_LoadPrefsInDirList(
nsAutoCString leaf; nsAutoCString leaf;
path->GetNativeLeafName(leaf); path->GetNativeLeafName(leaf);
@ -98,7 +98,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
{ {
nsZipItemPtr<char> manifest(jarReader, name, true); nsZipItemPtr<char> manifest(jarReader, name, true);
NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
@@ -1263,26 +1282,38 @@ static nsresult pref_InitInitialObjects( @@ -1296,26 +1315,38 @@ static nsresult pref_InitInitialObjects(
/* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
static const char* specialFiles[] = { static const char* specialFiles[] = {
#if defined(XP_MACOSX) #if defined(XP_MACOSX)
@ -268,7 +268,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
--- a/toolkit/content/jar.mn --- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn
@@ -55,29 +55,33 @@ toolkit.jar: @@ -54,29 +54,33 @@ toolkit.jar:
content/global/viewZoomOverlay.js (viewZoomOverlay.js) content/global/viewZoomOverlay.js (viewZoomOverlay.js)
*+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml)
content/global/bindings/browser.xml (widgets/browser.xml) content/global/bindings/browser.xml (widgets/browser.xml)
@ -306,7 +306,7 @@ diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/di
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/toolkit/content/widgets/dialog-kde.xml +++ b/toolkit/content/widgets/dialog-kde.xml
@@ -0,0 +1,449 @@ @@ -0,0 +1,455 @@
+<?xml version="1.0"?> +<?xml version="1.0"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public +<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this + - License, v. 2.0. If a copy of the MPL was not distributed with this
@ -342,7 +342,7 @@ new file mode 100644
+ > + >
+ <xul:button dlgtype="help" class="dialog-button" hidden="true"/> + <xul:button dlgtype="help" class="dialog-button" hidden="true"/>
+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> + <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
+ <xul:spacer anonid="spacer" flex="1" hidden="true"/> + <xul:spacer anonid="spacer" flex="1"/>
+ <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/> + <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/>
+ <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/> + <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
+ <xul:button dlgtype="cancel" class="dialog-button"/> + <xul:button dlgtype="cancel" class="dialog-button"/>
@ -675,9 +675,15 @@ new file mode 100644
+ if (!button.disabled) { + if (!button.disabled) {
+ var noCancel = this._fireButtonEvent(aDlgType); + var noCancel = this._fireButtonEvent(aDlgType);
+ if (noCancel) { + if (noCancel) {
+ if (aDlgType == "accept" || aDlgType == "cancel") + if (aDlgType == "accept" || aDlgType == "cancel") {
+ var closingEvent = new CustomEvent("dialogclosing", {
+ bubbles: true,
+ detail: { button: aDlgType },
+ });
+ this.dispatchEvent(closingEvent);
+ window.close(); + window.close();
+ } + }
+ }
+ return noCancel; + return noCancel;
+ } + }
+ return true; + return true;
@ -2221,7 +2227,7 @@ diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
'nsNativeAppSupportDefault.cpp', 'nsNativeAppSupportDefault.cpp',
] ]
if CONFIG['MOZ_X11']: if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
@ -2719,11 +2725,14 @@ diff --git a/uriloader/exthandler/unix/nsCommonRegistry.h b/uriloader/exthandler
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/uriloader/exthandler/unix/nsCommonRegistry.h +++ b/uriloader/exthandler/unix/nsCommonRegistry.h
@@ -0,0 +1,23 @@ @@ -0,0 +1,28 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public +/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this + * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ +
+#ifndef nsCommonRegistry_h__
+#define nsCommonRegistry_h__
+
+#include "nsIURI.h" +#include "nsIURI.h"
+#include "nsCOMPtr.h" +#include "nsCOMPtr.h"
+ +
@ -2743,6 +2752,8 @@ new file mode 100644
+ +
+ static already_AddRefed<nsMIMEInfoBase> GetFromType(const nsACString& aMIMEType); + static already_AddRefed<nsMIMEInfoBase> GetFromType(const nsACString& aMIMEType);
+}; +};
+
+#endif
diff --git a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/unix/nsKDERegistry.cpp diff --git a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/unix/nsKDERegistry.cpp
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
@ -2840,11 +2851,14 @@ diff --git a/uriloader/exthandler/unix/nsKDERegistry.h b/uriloader/exthandler/un
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/uriloader/exthandler/unix/nsKDERegistry.h +++ b/uriloader/exthandler/unix/nsKDERegistry.h
@@ -0,0 +1,29 @@ @@ -0,0 +1,34 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public +/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this + * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ +
+#ifndef nsKDERegistry_h__
+#define nsKDERegistry_h__
+
+#include "nsIURI.h" +#include "nsIURI.h"
+#include "nsCOMPtr.h" +#include "nsCOMPtr.h"
+#include "nsTArray.h" +#include "nsTArray.h"
@ -2870,6 +2884,8 @@ new file mode 100644
+ static already_AddRefed<nsMIMEInfoBase> GetFromHelper(const nsTArray<nsCString>& command); + static already_AddRefed<nsMIMEInfoBase> GetFromHelper(const nsTArray<nsCString>& command);
+ +
+}; +};
+
+#endif //nsKDERegistry_h__
diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
--- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
@ -3082,7 +3098,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
diff --git a/widget/gtk/Makefile.in b/widget/gtk/Makefile.in diff --git a/widget/gtk/Makefile.in b/widget/gtk/Makefile.in
--- a/widget/gtk/Makefile.in --- a/widget/gtk/Makefile.in
+++ b/widget/gtk/Makefile.in +++ b/widget/gtk/Makefile.in
@@ -3,11 +3,13 @@ @@ -3,14 +3,16 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
@ -3096,6 +3112,9 @@ diff --git a/widget/gtk/Makefile.in b/widget/gtk/Makefile.in
CFLAGS += $(TK_CFLAGS) CFLAGS += $(TK_CFLAGS)
CXXFLAGS += $(TK_CFLAGS) CXXFLAGS += $(TK_CFLAGS)
ifdef MOZ_ENABLE_DBUS
CXXFLAGS += $(MOZ_DBUS_GLIB_CFLAGS)
endif
diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
--- a/widget/gtk/nsFilePicker.cpp --- a/widget/gtk/nsFilePicker.cpp
+++ b/widget/gtk/nsFilePicker.cpp +++ b/widget/gtk/nsFilePicker.cpp