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

update to 46.0.1

Browse source
This commit is contained in:
Tigro 2016-05-05 08:30:45 +03:00
parent 7f44bb7bdc
commit 984905dc48
4 changed files with 82 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources: sources:
firefox-45.0.2.source.tar.xz: a4ca00cba9e351534b9c15b091deb10ed011fd30 firefox-46.0.1.source.tar.xz: 6705d7d1561dfa156ddd3277dc4a901c4c982d82

87
firefox-45-kde.patch → firefox-46-kde.patch
View file

@ -1,11 +1,11 @@
# HG changeset patch # HG changeset patch
# Parent 25d63ce139ad6e957d2565e3b83d01dfa36ea314 # Parent fd5629206dcf3f64d85ab177be6bc6076f0f1619
diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
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,1181 @@ @@ -0,0 +1,1175 @@
+#filter substitution +#filter substitution
+<?xml version="1.0"?> +<?xml version="1.0"?>
+# -*- Mode: HTML -*- +# -*- Mode: HTML -*-
@ -16,7 +16,7 @@ new file mode 100644
+ +
+<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?> +<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?> +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
+<?xml-stylesheet href="chrome://devtools/skin/common.css" type="text/css"?> +<?xml-stylesheet href="chrome://devtools/skin/devtools-browser.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?> +<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUIOverlay.css" type="text/css"?> +<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUIOverlay.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
@ -617,9 +617,9 @@ new file mode 100644
+ fullscreentoolbar="true" mode="icons" customizable="true" + fullscreentoolbar="true" mode="icons" customizable="true"
+ iconsize="small" + iconsize="small"
+#ifdef MOZ_DEV_EDITION +#ifdef MOZ_DEV_EDITION
+ defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,pocket-button,downloads-button,home-button,loop-button" + defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button,loop-button"
+#else +#else
+ defaultset="urlbar-container,search-container,bookmarks-menu-button,pocket-button,downloads-button,home-button,loop-button" + defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,loop-button"
+#endif +#endif
+ customizationtarget="nav-bar-customization-target" + customizationtarget="nav-bar-customization-target"
+ overflowable="true" + overflowable="true"
@ -795,7 +795,6 @@ new file mode 100644
+ oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);" + oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);"
+ onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);" + onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
+ onpopupshowing="BookmarkingUI.onPopupShowing(event); + onpopupshowing="BookmarkingUI.onPopupShowing(event);
+ BookmarkingUI.updatePocketItemVisibility('BMB_');
+ BookmarkingUI.attachPlacesView(event, this);" + BookmarkingUI.attachPlacesView(event, this);"
+ tooltip="bhTooltip" popupsinherittooltip="true"> + tooltip="bhTooltip" popupsinherittooltip="true">
+ <menuitem id="BMB_viewBookmarksSidebar" + <menuitem id="BMB_viewBookmarksSidebar"
@ -812,11 +811,6 @@ new file mode 100644
+ command="Browser:ShowAllBookmarks" + command="Browser:ShowAllBookmarks"
+ key="manBookmarkKb"/> + key="manBookmarkKb"/>
+ <menuseparator/> + <menuseparator/>
+ <menuitem id="BMB_pocket"
+ class="menuitem-iconic bookmark-item subviewbutton"
+ label="&pocketMenuitem.label;"
+ oncommand="openUILink(Pocket.listURL, event);"/>
+ <menuseparator id="BMB_pocketSeparator"/>
+ <menuitem id="BMB_subscribeToPageMenuitem" + <menuitem id="BMB_subscribeToPageMenuitem"
+#ifndef XP_MACOSX +#ifndef XP_MACOSX
+ class="menuitem-iconic subviewbutton" + class="menuitem-iconic subviewbutton"
@ -1272,7 +1266,7 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.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 --- a/browser/components/preferences/in-content/main.js
+++ b/browser/components/preferences/in-content/main.js +++ b/browser/components/preferences/in-content/main.js
@@ -18,16 +18,22 @@ var gMainPane = { @@ -19,16 +19,22 @@ var gMainPane = {
init: function () init: function ()
{ {
function setEventListener(aId, aEventType, aCallback) function setEventListener(aId, aEventType, aCallback)
@ -1295,7 +1289,7 @@ diff --git a/browser/components/preferences/in-content/main.js b/browser/compone
// 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.
@@ -720,16 +726,27 @@ var gMainPane = { @@ -704,16 +710,27 @@ var gMainPane = {
*/ */
setDefaultBrowser: function() setDefaultBrowser: function()
{ {
@ -1326,7 +1320,7 @@ diff --git a/browser/components/preferences/in-content/main.js b/browser/compone
diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build
--- a/browser/components/shell/moz.build --- a/browser/components/shell/moz.build
+++ b/browser/components/shell/moz.build +++ b/browser/components/shell/moz.build
@@ -30,16 +30,18 @@ if CONFIG['OS_ARCH'] == 'WINNT': @@ -34,16 +34,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
] ]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
SOURCES += [ SOURCES += [
@ -1349,7 +1343,7 @@ diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/browser/components/shell/nsKDEShellService.cpp +++ b/browser/components/shell/nsKDEShellService.cpp
@@ -0,0 +1,251 @@ @@ -0,0 +1,203 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* -*- 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 +/* 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
@ -1380,7 +1374,7 @@ new file mode 100644
+ return NS_OK; + return NS_OK;
+} +}
+ +
+NS_IMPL_ISUPPORTS(nsKDEShellService, nsIShellService) +NS_IMPL_ISUPPORTS(nsKDEShellService, nsIGNOMEShellService, nsIShellService)
+ +
+NS_IMETHODIMP +NS_IMETHODIMP
+nsKDEShellService::IsDefaultBrowser(bool aStartupCheck, +nsKDEShellService::IsDefaultBrowser(bool aStartupCheck,
@ -1430,54 +1424,6 @@ new file mode 100644
+} +}
+ +
+NS_IMETHODIMP +NS_IMETHODIMP
+nsKDEShellService::GetShouldCheckDefaultBrowser(bool* aResult)
+{
+ // If we've already checked, the browser has been started and this is a
+ // new window open, and we don't want to check again.
+ if (mCheckedThisSession) {
+ *aResult = false;
+ return NS_OK;
+ }
+
+ nsresult rv;
+#ifndef RELEASE_BUILD
+ bool skipDefaultBrowserCheck;
+ rv = GetShouldSkipCheckDefaultBrowser(&skipDefaultBrowserCheck);
+ if (NS_FAILED(rv)) {
+ return rv;
+ }
+ if (skipDefaultBrowserCheck) {
+ *aResult = false;
+ return rv;
+ }
+#endif
+
+ nsCOMPtr<nsIPrefBranch> prefs;
+ nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID));
+ if (pserve)
+ pserve->GetBranch("", getter_AddRefs(prefs));
+
+ if (prefs)
+ prefs->GetBoolPref(PREF_CHECKDEFAULTBROWSER, aResult);
+
+ return NS_OK;
+}
+
+NS_IMETHODIMP
+nsKDEShellService::SetShouldCheckDefaultBrowser(bool aShouldCheck)
+{
+ nsCOMPtr<nsIPrefBranch> prefs;
+ nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID));
+ if (pserve)
+ pserve->GetBranch("", getter_AddRefs(prefs));
+
+ if (prefs)
+ prefs->SetBoolPref(PREF_CHECKDEFAULTBROWSER, aShouldCheck);
+
+ return NS_OK;
+}
+
+NS_IMETHODIMP
+nsKDEShellService::GetCanSetDesktopBackground(bool* aResult) +nsKDEShellService::GetCanSetDesktopBackground(bool* aResult)
+{ +{
+ *aResult = true; + *aResult = true;
@ -1605,7 +1551,7 @@ diff --git a/browser/components/shell/nsKDEShellService.h b/browser/components/s
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/browser/components/shell/nsKDEShellService.h +++ b/browser/components/shell/nsKDEShellService.h
@@ -0,0 +1,29 @@ @@ -0,0 +1,30 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* -*- 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 +/* 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
@ -1614,16 +1560,17 @@ new file mode 100644
+#ifndef nskdeshellservice_h____ +#ifndef nskdeshellservice_h____
+#define nskdeshellservice_h____ +#define nskdeshellservice_h____
+ +
+#include "nsIShellService.h" +#include "nsIGNOMEShellService.h"
+#include "nsStringAPI.h" +#include "nsStringAPI.h"
+#include "mozilla/Attributes.h" +#include "mozilla/Attributes.h"
+ +
+class nsKDEShellService final : public nsIShellService +class nsKDEShellService final : public nsIGNOMEShellService
+{ +{
+public: +public:
+ nsKDEShellService() : mCheckedThisSession(false) { } + nsKDEShellService() : mCheckedThisSession(false) { }
+ +
+ NS_DECL_ISUPPORTS + NS_DECL_ISUPPORTS
+ NS_DECL_NSIGNOMESHELLSERVICE
+ NS_DECL_NSISHELLSERVICE + NS_DECL_NSISHELLSERVICE
+ +
+ nsresult Init(); + nsresult Init();
@ -1676,7 +1623,7 @@ new file mode 100644
+#ifndef nsunixshellservice_h____ +#ifndef nsunixshellservice_h____
+#define nsunixshellservice_h____ +#define nsunixshellservice_h____
+ +
+#include "nsIShellService.h" +#include "nsIGNOMEShellService.h"
+ +
+NS_METHOD +NS_METHOD
+nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult); +nsUnixShellServiceConstructor(nsISupports *aOuter, REFNSIID aIID, void **aResult);
@ -1685,9 +1632,9 @@ 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
@@ -705,16 +705,17 @@ @@ -703,16 +703,17 @@
@RESPATH@/greprefs.js
@RESPATH@/defaults/autoconfig/prefcalls.js @RESPATH@/defaults/autoconfig/prefcalls.js
@RESPATH@/browser/defaults/profile/prefs.js
@RESPATH@/browser/defaults/permissions @RESPATH@/browser/defaults/permissions
; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)

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 45.0.2 %define major 46.0.1
%define ff_epoch 0 %define ff_epoch 0
# (tpg) set version HERE !!! # (tpg) set version HERE !!!
%define realver %{major} %define realver %{major}
@ -46,8 +46,8 @@ Source9: kde.js
Source1000: README.urpmi Source1000: README.urpmi
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-45-kde.patch Patch11: firefox-46-kde.patch
Patch12: mozilla-45-kde.patch Patch12: mozilla-46-kde.patch
#Patch13: mozilla-kde-background.patch #Patch13: mozilla-kde-background.patch
Patch34: xulrunner_nojit.patch Patch34: xulrunner_nojit.patch
Patch35: firefox-37-build-with-time-independent-uuids.patch Patch35: firefox-37-build-with-time-independent-uuids.patch

84
mozilla-45-kde.patch → mozilla-46-kde.patch
View file

@ -1,5 +1,5 @@
# HG changeset patch # HG changeset patch
# Parent 797d5f17b080f54439602f107ecaf6b09a0ef5c1 # Parent 61cdc9af8ceaf75083e751e0d6497feddc26f7ba
Description: Add KDE integration to Firefox (toolkit parts) Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Author: Lubos Lunak <lunak@suse.com> Author: Lubos Lunak <lunak@suse.com>
@ -9,7 +9,7 @@ Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
--- a/modules/libpref/Preferences.cpp --- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp +++ b/modules/libpref/Preferences.cpp
@@ -30,16 +30,17 @@ @@ -31,16 +31,17 @@
#include "nsIZipReader.h" #include "nsIZipReader.h"
#include "nsPrefBranch.h" #include "nsPrefBranch.h"
#include "nsXPIDLString.h" #include "nsXPIDLString.h"
@ -27,7 +27,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
#include "prefread.h" #include "prefread.h"
#include "prefapi_private_data.h" #include "prefapi_private_data.h"
@@ -1136,16 +1137,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char @@ -1135,16 +1136,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
static nsresult pref_LoadPrefsInDirList(const char *listId) static nsresult pref_LoadPrefsInDirList(const char *listId)
{ {
@ -62,7 +62,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
return NS_OK; return NS_OK;
bool hasMore; bool hasMore;
@@ -1161,17 +1180,17 @@ static nsresult pref_LoadPrefsInDirList( @@ -1160,17 +1179,17 @@ static nsresult pref_LoadPrefsInDirList(
nsAutoCString leaf; nsAutoCString leaf;
path->GetNativeLeafName(leaf); path->GetNativeLeafName(leaf);
@ -81,7 +81,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
{ {
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);
@@ -1265,26 +1284,38 @@ static nsresult pref_InitInitialObjects( @@ -1264,24 +1283,36 @@ 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)
@ -91,9 +91,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
#elif defined(XP_UNIX) #elif defined(XP_UNIX)
"unix.js" "unix.js"
+ , "" // placeholder for KDE (empty is otherwise harmless) + , "" // placeholder for KDE (empty is otherwise harmless)
#if defined(VMS) #if defined(_AIX)
, "openvms.js"
#elif defined(_AIX)
, "aix.js" , "aix.js"
#endif #endif
#elif defined(XP_BEOS) #elif defined(XP_BEOS)
@ -189,7 +187,7 @@ diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpac
diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build
--- a/toolkit/components/downloads/moz.build --- a/toolkit/components/downloads/moz.build
+++ b/toolkit/components/downloads/moz.build +++ b/toolkit/components/downloads/moz.build
@@ -65,15 +65,16 @@ if not CONFIG['MOZ_SUITE']: @@ -64,15 +64,16 @@ if not CONFIG['MOZ_SUITE']:
'nsDownloadManagerUI.js', 'nsDownloadManagerUI.js',
'nsDownloadManagerUI.manifest', 'nsDownloadManagerUI.manifest',
] ]
@ -278,31 +276,31 @@ 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
@@ -64,29 +64,33 @@ toolkit.jar: @@ -72,29 +72,33 @@ toolkit.jar:
content/global/viewZoomOverlay.js content/global/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)
content/global/bindings/button.xml (widgets/button.xml) content/global/bindings/button.xml (widgets/button.xml)
content/global/bindings/checkbox.xml (widgets/checkbox.xml) content/global/bindings/checkbox.xml (widgets/checkbox.xml)
content/global/bindings/colorpicker.xml (widgets/colorpicker.xml) content/global/bindings/colorpicker.xml (widgets/colorpicker.xml)
content/global/bindings/datetimepicker.xml (widgets/datetimepicker.xml) content/global/bindings/datetimepicker.xml (widgets/datetimepicker.xml)
*+ content/global/bindings/dialog.xml (widgets/dialog.xml) * content/global/bindings/dialog.xml (widgets/dialog.xml)
+*+ content/global/bindings/dialog-kde.xml (widgets/dialog-kde.xml) +* content/global/bindings/dialog-kde.xml (widgets/dialog-kde.xml)
+% override chrome://global/content/bindings/dialog.xml chrome://global/content/bindings/dialog-kde.xml desktop=kde +% override chrome://global/content/bindings/dialog.xml chrome://global/content/bindings/dialog-kde.xml desktop=kde
content/global/bindings/editor.xml (widgets/editor.xml) content/global/bindings/editor.xml (widgets/editor.xml)
content/global/bindings/expander.xml (widgets/expander.xml) content/global/bindings/expander.xml (widgets/expander.xml)
* content/global/bindings/filefield.xml (widgets/filefield.xml) content/global/bindings/filefield.xml (widgets/filefield.xml)
*+ content/global/bindings/findbar.xml (widgets/findbar.xml) * content/global/bindings/findbar.xml (widgets/findbar.xml)
content/global/bindings/general.xml (widgets/general.xml) content/global/bindings/general.xml (widgets/general.xml)
content/global/bindings/groupbox.xml (widgets/groupbox.xml) content/global/bindings/groupbox.xml (widgets/groupbox.xml)
*+ content/global/bindings/listbox.xml (widgets/listbox.xml) content/global/bindings/listbox.xml (widgets/listbox.xml)
content/global/bindings/menu.xml (widgets/menu.xml) content/global/bindings/menu.xml (widgets/menu.xml)
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
content/global/bindings/progressmeter.xml (widgets/progressmeter.xml) content/global/bindings/progressmeter.xml (widgets/progressmeter.xml)
content/global/bindings/radio.xml (widgets/radio.xml) content/global/bindings/radio.xml (widgets/radio.xml)
@ -316,7 +314,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,460 @@ @@ -0,0 +1,463 @@
+<?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
@ -491,6 +489,9 @@ new file mode 100644
+ <parameter name="aEvent"/> + <parameter name="aEvent"/>
+ <body> + <body>
+ <![CDATA[ + <![CDATA[
+ let { AppConstants } =
+ Components.utils.import("resource://gre/modules/AppConstants.jsm", {});
+
+ function focusInit() { + function focusInit() {
+ const dialog = document.documentElement; + const dialog = document.documentElement;
+ const defaultButton = dialog.getButton(dialog.defaultButton); + const defaultButton = dialog.getButton(dialog.defaultButton);
@ -516,11 +517,10 @@ new file mode 100644
+ initialFocusedElt.focus(); + initialFocusedElt.focus();
+ } + }
+ } + }
+#ifndef XP_MACOSX + else if (AppConstants.platform != "macosx" &&
+ else if (focusedElt.hasAttribute("dlgtype") && focusedElt != defaultButton) { + focusedElt.hasAttribute("dlgtype") && focusedElt != defaultButton) {
+ defaultButton.focus(); + defaultButton.focus();
+ } + }
+#endif
+ } + }
+ } + }
+ +
@ -637,13 +637,14 @@ new file mode 100644
+ for (dlgtype in buttons) + for (dlgtype in buttons)
+ buttons[dlgtype].hidden = !shown[dlgtype]; + buttons[dlgtype].hidden = !shown[dlgtype];
+ +
+#ifdef XP_WIN + let { AppConstants } =
+# show the spacer on Windows only when the extra2 button is present + Components.utils.import("resource://gre/modules/AppConstants.jsm", {});
+ // show the spacer on Windows only when the extra2 button is present
+ if (AppConstants.platform == "win") {
+ var spacer = document.getAnonymousElementByAttribute(this, "anonid", "spacer"); + var spacer = document.getAnonymousElementByAttribute(this, "anonid", "spacer");
+ spacer.removeAttribute("hidden"); + spacer.removeAttribute("hidden");
+ spacer.setAttribute("flex", shown["extra2"]?"1":"0"); + spacer.setAttribute("flex", shown["extra2"]?"1":"0");
+#endif + }
+
+ } + }
+ ]]> + ]]>
+ </body> + </body>
@ -781,7 +782,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,1403 @@ @@ -0,0 +1,1406 @@
+<?xml version="1.0"?> +<?xml version="1.0"?>
+ +
+<!DOCTYPE bindings [ +<!DOCTYPE bindings [
@ -1415,19 +1416,22 @@ new file mode 100644
+ var acceptButton = docElt.getButton("accept"); + var acceptButton = docElt.getButton("accept");
+ acceptButton.hidden = true; + acceptButton.hidden = true;
+ var cancelButton = docElt.getButton("cancel"); + var cancelButton = docElt.getButton("cancel");
+#ifdef XP_MACOSX +
+ let { AppConstants } =
+ Components.utils.import("resource://gre/modules/AppConstants.jsm", {});
+ if (AppConstants.platform == "macosx") {
+ // no buttons on Mac except Help + // no buttons on Mac except Help
+ cancelButton.hidden = true; + cancelButton.hidden = true;
+ // Move Help button to the end + // Move Help button to the end
+ document.getAnonymousElementByAttribute(this, "anonid", "spacer").hidden = true; + document.getAnonymousElementByAttribute(this, "anonid", "spacer").hidden = true;
+ // Also, don't fire onDialogAccept on enter + // Also, don't fire onDialogAccept on enter
+ acceptButton.disabled = true; + acceptButton.disabled = true;
+#else + } else {
+ // morph the Cancel button into the Close button + // morph the Cancel button into the Close button
+ cancelButton.setAttribute ("icon", "close"); + cancelButton.setAttribute ("icon", "close");
+ cancelButton.label = docElt.getAttribute("closebuttonlabel"); + cancelButton.label = docElt.getAttribute("closebuttonlabel");
+ cancelButton.accesskey = docElt.getAttribute("closebuttonaccesskey"); + cancelButton.accesskey = docElt.getAttribute("closebuttonaccesskey");
+#endif + }
+ } + }
+ } + }
+ this.setAttribute("animated", this._shouldAnimate ? "true" : "false"); + this.setAttribute("animated", this._shouldAnimate ? "true" : "false");
@ -1597,11 +1601,13 @@ new file mode 100644
+ <parameter name="aPaneElement"/> + <parameter name="aPaneElement"/>
+ <body> + <body>
+ <![CDATA[ + <![CDATA[
+#ifdef XP_MACOSX + let { AppConstants } =
+ Components.utils.import("resource://gre/modules/AppConstants.jsm", {});
+ if (AppConstants.platform == "macosx") {
+ var paneTitle = aPaneElement.label; + var paneTitle = aPaneElement.label;
+ if (paneTitle != "") + if (paneTitle != "")
+ document.title = paneTitle; + document.title = paneTitle;
+#endif + }
+ var helpButton = document.documentElement.getButton("help"); + var helpButton = document.documentElement.getButton("help");
+ if (aPaneElement.helpTopic) + if (aPaneElement.helpTopic)
+ helpButton.hidden = false; + helpButton.hidden = false;
@ -1671,13 +1677,11 @@ new file mode 100644
+ <property name="_shouldAnimate"> + <property name="_shouldAnimate">
+ <getter> + <getter>
+ <![CDATA[ + <![CDATA[
+ let { AppConstants } =
+ Components.utils.import("resource://gre/modules/AppConstants.jsm", {});
+ var psvc = Components.classes["@mozilla.org/preferences-service;1"] + var psvc = Components.classes["@mozilla.org/preferences-service;1"]
+ .getService(Components.interfaces.nsIPrefBranch); + .getService(Components.interfaces.nsIPrefBranch);
+#ifdef XP_MACOSX + var animate = AppConstants.platform == "macosx";
+ var animate = true;
+#else
+ var animate = false;
+#endif
+ try { + try {
+ animate = psvc.getBoolPref("browser.preferences.animateFadeIn"); + animate = psvc.getBoolPref("browser.preferences.animateFadeIn");
+ } + }
@ -3683,7 +3687,7 @@ diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
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
@@ -47,16 +47,17 @@ @@ -44,16 +44,17 @@
#include "prproces.h" #include "prproces.h"
#include "nsIDirectoryEnumerator.h" #include "nsIDirectoryEnumerator.h"
#include "nsISimpleEnumerator.h" #include "nsISimpleEnumerator.h"
@ -3701,7 +3705,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"
@@ -1963,42 +1964,52 @@ nsLocalFile::SetPersistentDescriptor(con @@ -1948,42 +1949,52 @@ nsLocalFile::SetPersistentDescriptor(con
return InitWithNativePath(aPersistentDescriptor); return InitWithNativePath(aPersistentDescriptor);
#endif #endif
} }
@ -3760,7 +3764,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;
@@ -2006,16 +2017,22 @@ nsLocalFile::Reveal() @@ -1991,16 +2002,22 @@ nsLocalFile::Reveal()
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
#endif #endif
} }