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

update to 32.0

Browse source
This commit is contained in:
Tigro 2014-09-02 12:36:58 +04:00
parent 3071047c3e
commit 23f74fadd0
4 changed files with 144 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,3 +1,3 @@
sources: sources:
firefox-searchengines-bing.xml: ccdb7c0cc2d288714f70f8a92f0adfc2766f2b36 firefox-searchengines-bing.xml: ccdb7c0cc2d288714f70f8a92f0adfc2766f2b36
firefox-31.0.source.tar.bz2: a6c3e25ee3aeb7da42db2aaeb50a385d63532beb firefox-32.0.source.tar.bz2: 5cb7644af9741ebcdb3a21b777362913908c8f41

43
firefox-31-kde.patch → firefox-32-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,1197 @@ @@ -0,0 +1,1206 @@
+#filter substitution +#filter substitution
+<?xml version="1.0"?> +<?xml version="1.0"?>
+# -*- Mode: HTML -*- +# -*- Mode: HTML -*-
@ -106,6 +106,12 @@ new file mode 100644
+ accesskey="&moveToNewWindow.accesskey;" + accesskey="&moveToNewWindow.accesskey;"
+ tbattr="tabbrowser-multiple" + tbattr="tabbrowser-multiple"
+ oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/> + oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/>
+#ifdef E10S_TESTING_ONLY
+ <menuitem id="context_openNonRemoteWindow" label="Open in new non-e10s window"
+ tbattr="tabbrowser-remote"
+ hidden="true"
+ oncommand="gBrowser.openNonRemoteWindow(TabContextMenu.contextTab);"/>
+#endif
+ <menuseparator/> + <menuseparator/>
+ <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;" + <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;"
+ tbattr="tabbrowser-multiple-visible" + tbattr="tabbrowser-multiple-visible"
@ -245,7 +251,7 @@ new file mode 100644
+ onpopuphidden="SocialShare.onHidden()" + onpopuphidden="SocialShare.onHidden()"
+ hidden="true"> + hidden="true">
+ <vbox class="social-share-toolbar"> + <vbox class="social-share-toolbar">
+ <vbox id="social-share-provider-buttons" flex="1"/> + <arrowscrollbox id="social-share-provider-buttons" orient="vertical" flex="1"/>
+ </vbox> + </vbox>
+ </panel> + </panel>
+ +
@ -311,7 +317,7 @@ new file mode 100644
+ oncommand="BrowserFullScreen();"/> + oncommand="BrowserFullScreen();"/>
+ </menupopup> + </menupopup>
+ +
+ <menupopup id="contentAreaContextMenu" pagemenu="start" + <menupopup id="contentAreaContextMenu" pagemenu="#page-menu-separator"
+ onpopupshowing="if (event.target != this) + onpopupshowing="if (event.target != this)
+ return true; + return true;
+ gContextMenu = new nsContextMenu(this, event.shiftKey); + gContextMenu = new nsContextMenu(this, event.shiftKey);
@ -578,7 +584,7 @@ new file mode 100644
+ label="&tabCmd.label;" + label="&tabCmd.label;"
+ command="cmd_newNavigatorTab" + command="cmd_newNavigatorTab"
+ onclick="checkForMiddleClick(this, event);" + onclick="checkForMiddleClick(this, event);"
+ tooltiptext="&newTabButton.tooltip;" + tooltip="dynamic-shortcut-tooltip"
+ ondrop="newTabButtonObserver.onDrop(event)" + ondrop="newTabButtonObserver.onDrop(event)"
+ ondragover="newTabButtonObserver.onDragOver(event)" + ondragover="newTabButtonObserver.onDragOver(event)"
+ ondragenter="newTabButtonObserver.onDragOver(event)" + ondragenter="newTabButtonObserver.onDragOver(event)"
@ -874,6 +880,7 @@ new file mode 100644
+ during the customization of the toolbar, in the palette, and before + during the customization of the toolbar, in the palette, and before
+ the Downloads Indicator overlay is loaded. --> + the Downloads Indicator overlay is loaded. -->
+ <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ key="key_openDownloads"
+ oncommand="DownloadsIndicatorView.onCommand(event);" + oncommand="DownloadsIndicatorView.onCommand(event);"
+ ondrop="DownloadsIndicatorView.onDrop(event);" + ondrop="DownloadsIndicatorView.onDrop(event);"
+ ondragover="DownloadsIndicatorView.onDragOver(event);" + ondragover="DownloadsIndicatorView.onDragOver(event);"
@ -881,7 +888,7 @@ new file mode 100644
+ label="&downloads.label;" + label="&downloads.label;"
+ removable="true" + removable="true"
+ cui-areatype="toolbar" + cui-areatype="toolbar"
+ tooltiptext="&downloads.tooltip;"/> + tooltip="dynamic-shortcut-tooltip"/>
+ +
+ <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ persist="class" removable="true" + persist="class" removable="true"
@ -890,6 +897,7 @@ new file mode 100644
+ ondragenter="homeButtonObserver.onDragOver(event)" + ondragenter="homeButtonObserver.onDragOver(event)"
+ ondrop="homeButtonObserver.onDrop(event)" + ondrop="homeButtonObserver.onDrop(event)"
+ ondragexit="homeButtonObserver.onDragExit(event)" + ondragexit="homeButtonObserver.onDragExit(event)"
+ key="goHome"
+ onclick="BrowserGoHome(event);" + onclick="BrowserGoHome(event);"
+ cui-areatype="toolbar" + cui-areatype="toolbar"
+ aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> + aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
@ -897,11 +905,11 @@ new file mode 100644
+ +
+ <toolbarbutton id="social-share-button" + <toolbarbutton id="social-share-button"
+ class="toolbarbutton-1 chromeclass-toolbar-additional" + class="toolbarbutton-1 chromeclass-toolbar-additional"
+ hidden="true"
+ overflows="false"
+ label="&sharePageCmd.label;" + label="&sharePageCmd.label;"
+ tooltiptext="&sharePageCmd.label;" + tooltiptext="&sharePageCmd.label;"
+ cui-areatype="toolbar" + cui-areatype="toolbar"
+ removable="true"
+ hidden="true"
+ command="Social:SharePage"/> + command="Social:SharePage"/>
+ </hbox> + </hbox>
+ +
@ -1011,9 +1019,11 @@ new file mode 100644
+ +
+ <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+#ifdef XP_MACOSX +#ifdef XP_MACOSX
+ command="cmd_print" tooltip="dynamic-shortcut-tooltip" + command="cmd_print"
+ tooltip="dynamic-shortcut-tooltip"
+#else +#else
+ command="cmd_printPreview" tooltiptext="&printButton.tooltip;" + command="cmd_printPreview"
+ tooltiptext="&printButton.tooltip;"
+#endif +#endif
+ label="&printButton.label;"/> + label="&printButton.label;"/>
+ +
@ -1070,8 +1080,7 @@ new file mode 100644
+ tabcontainer="tabbrowser-tabs" + tabcontainer="tabbrowser-tabs"
+ contentcontextmenu="contentAreaContextMenu" + contentcontextmenu="contentAreaContextMenu"
+ autocompletepopup="PopupAutoComplete" + autocompletepopup="PopupAutoComplete"
+ selectpopup="ContentSelectDropdown" + selectpopup="ContentSelectDropdown"/>
+ onclick="contentAreaClick(event, false);"/>
+ <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/> + <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/>
+ </vbox> + </vbox>
+ <splitter id="social-sidebar-splitter" + <splitter id="social-sidebar-splitter"
@ -1203,7 +1212,7 @@ new file mode 100644
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
@@ -65,16 +65,18 @@ browser.jar: @@ -70,16 +70,18 @@ browser.jar:
content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png)
content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png)
content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml)
@ -1217,11 +1226,11 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn
* content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml)
* content/browser/chatWindow.xul (content/chatWindow.xul) * content/browser/chatWindow.xul (content/chatWindow.xul)
content/browser/content.js (content/content.js) content/browser/content.js (content/content.js)
content/browser/fonts/ClearSans-Regular.woff (content/fonts/ClearSans-Regular.woff)
content/browser/fonts/FiraSans-Regular.woff (content/fonts/FiraSans-Regular.woff)
content/browser/fonts/FiraSans-Light.woff (content/fonts/FiraSans-Light.woff)
content/browser/newtab/newTab.xul (content/newtab/newTab.xul) content/browser/newtab/newTab.xul (content/newtab/newTab.xul)
* content/browser/newtab/newTab.js (content/newtab/newTab.js) * content/browser/newtab/newTab.js (content/newtab/newTab.js)
content/browser/newtab/newTab.css (content/newtab/newTab.css)
* 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 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
--- a/browser/components/build/nsModule.cpp --- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp +++ b/browser/components/build/nsModule.cpp
@ -1308,7 +1317,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.
@@ -884,14 +890,25 @@ var gAdvancedPane = { @@ -875,14 +881,25 @@ var gAdvancedPane = {
* Set browser as the operating system default browser. * Set browser as the operating system default browser.
*/ */
setDefaultBrowser: function() setDefaultBrowser: function()
@ -1790,7 +1799,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
@@ -643,19 +643,21 @@ @@ -666,19 +666,21 @@
@BINPATH@/defaults/autoconfig/prefcalls.js @BINPATH@/defaults/autoconfig/prefcalls.js
@BINPATH@/browser/defaults/profile/prefs.js @BINPATH@/browser/defaults/profile/prefs.js

6
firefox.spec
View file

@ -7,7 +7,7 @@
# This also means only STABLE upstream releases, NO betas. # This also means only STABLE upstream releases, NO betas.
# This is a discussed topic. Please, do not flame it again. # This is a discussed topic. Please, do not flame it again.
%define major 31.0 %define major 32.0
%define ff_epoch 0 %define ff_epoch 0
# (tpg) set version HERE !!! # (tpg) set version HERE !!!
%define realver %{major} %define realver %{major}
@ -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-31-kde.patch Patch11: firefox-32-kde.patch
Patch12: mozilla-31-kde.patch Patch12: mozilla-32-kde.patch
Patch13: mozilla-kde-background.patch Patch13: mozilla-kde-background.patch
Patch34: xulrunner_nojit.patch Patch34: xulrunner_nojit.patch

94
mozilla-31-kde.patch → mozilla-32-kde.patch
View file

@ -85,7 +85,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
path->GetNativeLeafName(leaf); path->GetNativeLeafName(leaf);
// Do we care if a file provided by this process fails to load? // Do we care if a file provided by this process fails to load?
if (Substring(leaf, leaf.Length() - 4).Equals(NS_LITERAL_CSTRING(".xpi"))) if (Substring(leaf, leaf.Length() - 4).EqualsLiteral(".xpi"))
ReadExtensionPrefs(path); ReadExtensionPrefs(path);
else else
- pref_LoadPrefsInDir(path, nullptr, 0); - pref_LoadPrefsInDir(path, nullptr, 0);
@ -217,7 +217,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
#include "AndroidBridge.h" #include "AndroidBridge.h"
using namespace mozilla::widget::android; using namespace mozilla::widget::android;
#endif #endif
@@ -2722,16 +2726,25 @@ nsDownload::SetState(DownloadState aStat @@ -2729,16 +2733,25 @@ nsDownload::SetState(DownloadState aStat
nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
// Master pref to control this function. // Master pref to control this function.
@ -243,7 +243,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
int64_t goat = PR_Now() - mStartTime; int64_t goat = PR_Now() - mStartTime;
showTaskbarAlert = goat > alertIntervalUSec; showTaskbarAlert = goat > alertIntervalUSec;
@@ -2759,19 +2772,20 @@ nsDownload::SetState(DownloadState aStat @@ -2766,19 +2779,20 @@ nsDownload::SetState(DownloadState aStat
// because if it is, they'll click open the download manager and // because if it is, they'll click open the download manager and
// the items they downloaded will have been removed. // the items they downloaded will have been removed.
alerts->ShowAlertNotification( alerts->ShowAlertNotification(
@ -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
@@ -58,29 +58,33 @@ toolkit.jar: @@ -55,29 +55,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)
@ -290,7 +290,7 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
content/global/bindings/menulist.xml (widgets/menulist.xml) content/global/bindings/menulist.xml (widgets/menulist.xml)
content/global/bindings/notification.xml (widgets/notification.xml) content/global/bindings/notification.xml (widgets/notification.xml)
content/global/bindings/numberbox.xml (widgets/numberbox.xml) content/global/bindings/numberbox.xml (widgets/numberbox.xml)
* content/global/bindings/popup.xml (widgets/popup.xml) content/global/bindings/popup.xml (widgets/popup.xml)
*+ content/global/bindings/preferences.xml (widgets/preferences.xml) *+ content/global/bindings/preferences.xml (widgets/preferences.xml)
+*+ content/global/bindings/preferences-kde.xml (widgets/preferences-kde.xml) +*+ content/global/bindings/preferences-kde.xml (widgets/preferences-kde.xml)
+% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde +% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde
@ -760,7 +760,7 @@ diff --git a/toolkit/content/widgets/preferences-kde.xml b/toolkit/content/widge
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/toolkit/content/widgets/preferences-kde.xml +++ b/toolkit/content/widgets/preferences-kde.xml
@@ -0,0 +1,1333 @@ @@ -0,0 +1,1343 @@
+<?xml version="1.0"?> +<?xml version="1.0"?>
+ +
+<!DOCTYPE bindings [ +<!DOCTYPE bindings [
@ -793,6 +793,25 @@ new file mode 100644
+ +
+ <binding id="preferences"> + <binding id="preferences">
+ <implementation implements="nsIObserver"> + <implementation implements="nsIObserver">
+ <method name="_constructAfterChildren">
+ <body>
+ <![CDATA[
+ // This method will be called after each one of the child
+ // <preference> elements is constructed. Its purpose is to propagate
+ // the values to the associated form elements
+
+ var elements = this.getElementsByTagName("preference");
+ for (let element of elements) {
+ if (!element._constructed) {
+ return;
+ }
+ }
+ for (let element of elements) {
+ element.updateElements();
+ }
+ ]]>
+ </body>
+ </method>
+ <method name="observe"> + <method name="observe">
+ <parameter name="aSubject"/> + <parameter name="aSubject"/>
+ <parameter name="aTopic"/> + <parameter name="aTopic"/>
@ -864,6 +883,8 @@ new file mode 100644
+ <implementation> + <implementation>
+ <constructor> + <constructor>
+ <![CDATA[ + <![CDATA[
+ this._constructed = true;
+
+ // if the element has been inserted without the name attribute set, + // if the element has been inserted without the name attribute set,
+ // we have nothing to do here + // we have nothing to do here
+ if (!this.name) + if (!this.name)
@ -889,18 +910,20 @@ new file mode 100644
+ preference = parentPrefs[l]; + preference = parentPrefs[l];
+ } + }
+ } + }
+ this._setValue(preference ? preference.value +
+ : this.valueFromPreferences, false); + // Don't use the value setter here, we don't want updateElements to be prematurely fired.
+ this._value = preference ? preference.value : this.valueFromPreferences;
+ } + }
+ else + else
+ this._setValue(this.valueFromPreferences, false); + this._value = this.valueFromPreferences;
+ this.preferences._constructAfterChildren();
+ ]]> + ]]>
+ </constructor> + </constructor>
+ <destructor> + <destructor>
+ this.preferences.rootBranchInternal + this.preferences.rootBranchInternal
+ .removeObserver(this.name, this.preferences); + .removeObserver(this.name, this.preferences);
+ </destructor> + </destructor>
+ + <field name="_constructed">false</field>
+ <property name="instantApply"> + <property name="instantApply">
+ <getter> + <getter>
+ return this.getAttribute("instantApply") == "true" || this.preferences.instantApply; + return this.getAttribute("instantApply") == "true" || this.preferences.instantApply;
@ -932,24 +955,19 @@ new file mode 100644
+ <field name="_value">null</field> + <field name="_value">null</field>
+ <method name="_setValue"> + <method name="_setValue">
+ <parameter name="aValue"/> + <parameter name="aValue"/>
+ <parameter name="aUpdate"/>
+ <body> + <body>
+ <![CDATA[ + <![CDATA[
+ if (aUpdate && this.value !== aValue) { + if (this.value !== aValue) {
+ this._value = aValue; + this._value = aValue;
+ if (this.instantApply) + if (this.instantApply)
+ this.valueFromPreferences = aValue; + this.valueFromPreferences = aValue;
+ this.preferences.fireChangedEvent(this); + this.preferences.fireChangedEvent(this);
+ } + }
+ else if (!aUpdate) {
+ this._value = aValue;
+ this.updateElements();
+ }
+ return aValue; + return aValue;
+ ]]> + ]]>
+ </body> + </body>
+ </method> + </method>
+ <property name="value" onget="return this._value" onset="return this._setValue(val, true);"/> + <property name="value" onget="return this._value" onset="return this._setValue(val);"/>
+ +
+ <property name="locked"> + <property name="locked">
+ <getter> + <getter>
@ -1336,7 +1354,7 @@ new file mode 100644
+ </xul:deck> + </xul:deck>
+ </xul:hbox> + </xul:hbox>
+ <xul:hbox anonid="dlg-buttons" class="prefWindow-dlgbuttons" pack="end"> + <xul:hbox anonid="dlg-buttons" class="prefWindow-dlgbuttons" pack="end">
+#ifdef XP_UNIX_GNOME +#ifndef XP_UNIX
+ <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/> + <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
+ <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/> + <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> + <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
@ -1344,14 +1362,6 @@ new file mode 100644
+ <xul:spacer anonid="spacer" flex="1"/> + <xul:spacer anonid="spacer" flex="1"/>
+ <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/> + <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
+ <xul:button dlgtype="accept" class="dialog-button" icon="accept"/> + <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
+#elif XP_UNIX
+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
+ <xul:spacer anonid="spacer" flex="1"/>
+ <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
+ <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
+ <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
+ <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
+ <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
+#else +#else
+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> + <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
+ <xul:spacer anonid="spacer" flex="1"/> + <xul:spacer anonid="spacer" flex="1"/>
@ -2626,7 +2636,7 @@ diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
--- a/uriloader/exthandler/moz.build --- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build
@@ -80,17 +80,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco @@ -75,17 +75,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
else: else:
# These files can't be built in unified mode because they force NSPR logging. # These files can't be built in unified mode because they force NSPR logging.
SOURCES += [ SOURCES += [
@ -3584,7 +3594,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
--- a/xpcom/io/nsLocalFileUnix.cpp --- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp +++ b/xpcom/io/nsLocalFileUnix.cpp
@@ -43,16 +43,17 @@ @@ -44,16 +44,17 @@
#include "nsIDirectoryEnumerator.h" #include "nsIDirectoryEnumerator.h"
#include "nsISimpleEnumerator.h" #include "nsISimpleEnumerator.h"
#include "private/pprio.h" #include "private/pprio.h"
@ -3602,7 +3612,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
#include "prmem.h" #include "prmem.h"
#include "plbase64.h" #include "plbase64.h"
@@ -1816,46 +1817,52 @@ nsLocalFile::SetPersistentDescriptor(con @@ -1962,53 +1963,55 @@ nsLocalFile::SetPersistentDescriptor(con
return InitWithNativePath(aPersistentDescriptor); return InitWithNativePath(aPersistentDescriptor);
#endif #endif
} }
@ -3613,36 +3623,43 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
#ifdef MOZ_WIDGET_GTK #ifdef MOZ_WIDGET_GTK
- nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); - nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
- nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); - nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
- if (!giovfs && !gnomevfs) - if (!giovfs && !gnomevfs) {
- return NS_ERROR_FAILURE; - return NS_ERROR_FAILURE;
- }
- -
+ nsAutoCString url; + nsAutoCString url;
bool isDirectory; bool isDirectory;
if (NS_FAILED(IsDirectory(&isDirectory))) if (NS_FAILED(IsDirectory(&isDirectory))) {
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
}
+ nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); + nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
if (isDirectory) { if (isDirectory) {
- if (giovfs) - if (giovfs) {
- return giovfs->ShowURIForInput(mPath); - return giovfs->ShowURIForInput(mPath);
- else - } else
- /* Fallback to GnomeVFS */ - /* Fallback to GnomeVFS */
- {
- return gnomevfs->ShowURIForInput(mPath); - return gnomevfs->ShowURIForInput(mPath);
- }
+ url = mPath; + url = mPath;
} else if (giovfs && NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) { } else if (giovfs && NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) {
return NS_OK; return NS_OK;
} else { } else {
nsCOMPtr<nsIFile> parentDir; nsCOMPtr<nsIFile> parentDir;
nsAutoCString dirPath; nsAutoCString dirPath;
if (NS_FAILED(GetParent(getter_AddRefs(parentDir)))) if (NS_FAILED(GetParent(getter_AddRefs(parentDir)))) {
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
if (NS_FAILED(parentDir->GetNativePath(dirPath))) }
if (NS_FAILED(parentDir->GetNativePath(dirPath))) {
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
}
- if (giovfs) - if (giovfs) {
- return giovfs->ShowURIForInput(dirPath); - return giovfs->ShowURIForInput(dirPath);
- else - } else {
- return gnomevfs->ShowURIForInput(dirPath); - return gnomevfs->ShowURIForInput(dirPath);
- }
+ url = dirPath; + url = dirPath;
} }
+ +
@ -3669,7 +3686,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
return rv; return rv;
} }
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
@@ -1863,16 +1870,23 @@ nsLocalFile::Reveal() @@ -2016,16 +2019,22 @@ nsLocalFile::Reveal()
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
#endif #endif
} }
@ -3684,7 +3701,6 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
+ command.AppendElement( mPath ); + command.AppendElement( mPath );
+ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
+ } + }
+
nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
if (giovfs) { if (giovfs) {