mozilla: comparison mozilla-kde.patch

equal deleted inserted replaced

-:eb9ebe3e2e6a
+:c6717354928b
 # HG changeset patch
-# Parent  d9c9ae52f0338a60d1626d9209248341815e597a
+# Parent  61cdc9af8ceaf75083e751e0d6497feddc26f7ba
 Description: Add KDE integration to Firefox (toolkit parts)
 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
 Author: Lubos Lunak <lunak@suse.com>
 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
 https://bugzilla.novell.com/show_bug.cgi?id=170055
-diff --git a/modules/libpref/Makefile.in b/modules/libpref/Makefile.in
---- a/modules/libpref/Makefile.in
-+++ b/modules/libpref/Makefile.in
-@@ -21,13 +21,15 @@ endif
-ifdef MOZ_SERVICES_HEALTHREPORT
-ifneq (android,$(MOZ_WIDGET_TOOLKIT))
-grepref_files += $(topsrcdir)/services/healthreport/healthreport-prefs.js
-else
-grepref_files += $(topsrcdir)/mobile/android/chrome/content/healthreport-prefs.js
-endif
-endif
-+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
-+
-greprefs.js: $(grepref_files)
-	$(call py_action,preprocessor,$(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(MOZ_DEBUG_DEFINES) $^ -o $@)
-libs:: greprefs.js
-	$(INSTALL) $^ $(DIST)/bin/
 diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
 --- a/modules/libpref/Preferences.cpp
 +++ b/modules/libpref/Preferences.cpp
-@@ -30,16 +30,17 @@
+@@ -31,16 +31,17 @@
 #include "nsIZipReader.h"
 #include "nsPrefBranch.h"
 #include "nsXPIDLString.h"
 #include "nsCRT.h"
 #include "nsCOMArray.h"
 #include "prefapi.h"
 #include "prefread.h"
 #include "prefapi_private_data.h"
-@@ -1148,16 +1149,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
+@@ -1135,16 +1136,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
 static nsresult pref_LoadPrefsInDirList(const char *listId)
 {
 nsresult rv;
 nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv));
 getter_AddRefs(list));
 if (!list)
 return NS_OK;
 bool hasMore;
-@@ -1173,17 +1192,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1160,17 +1179,17 @@ static nsresult pref_LoadPrefsInDirList(
 nsAutoCString leaf;
 path->GetNativeLeafName(leaf);
 // Do we care if a file provided by this process fails to load?
 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name)
 {
 nsZipItemPtr<char> manifest(jarReader, name, true);
 NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1277,26 +1296,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 */
 static const char* specialFiles[] = {
 #if defined(XP_MACOSX)
 "macprefs.js"
 #elif defined(XP_WIN)
 "winpref.js"
 #elif defined(XP_UNIX)
 "unix.js"
 +    , "" // placeholder for KDE  (empty is otherwise harmless)
-#if defined(VMS)
+#if defined(_AIX)
-, "openvms.js"
-#elif defined(_AIX)
 , "aix.js"
 #endif
 #elif defined(XP_BEOS)
 "beos.js"
 #endif
 // Load jar:$app/omni.jar!/defaults/preferences/*.js
 // or jar:$gre/omni.jar!/defaults/preferences/*.js.
 RefPtr<nsZipArchive> appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP);
 // GetReader(mozilla::Omnijar::APP) returns null when $app == $gre, in which
+diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
+--- a/modules/libpref/moz.build
++++ b/modules/libpref/moz.build
+@@ -31,16 +31,20 @@ UNIFIED_SOURCES += [
+'prefread.cpp',
+]
+# prefapi.cpp cannot be built in unified mode because it uses plarena.h
+SOURCES += [
+'prefapi.cpp',
+]
++LOCAL_INCLUDES += [
++    '/toolkit/xre'
++]
++
+include('/ipc/chromium/chromium-config.mozbuild')
+FINAL_LIBRARY = 'xul'
+DEFINES['OS_ARCH'] = CONFIG['OS_ARCH']
+DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']
+if CONFIG['GNU_CXX']:
 diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py
 --- a/python/mozbuild/mozpack/chrome/flags.py
 +++ b/python/mozbuild/mozpack/chrome/flags.py
 @@ -211,16 +211,17 @@ class Flags(OrderedDict):
 'contentaccessible': Flag,
 self.base = base
 self.flags = Flags(*flags)
 diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build
 --- a/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.manifest',
 ]
 FINAL_LIBRARY = 'xul'
 #ifdef MOZ_WIDGET_ANDROID
 #include "AndroidBridge.h"
 #endif
-@@ -2714,16 +2718,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2719,16 +2723,25 @@ nsDownload::SetState(DownloadState aStat
 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
 // Master pref to control this function.
 bool showTaskbarAlert = true;
 if (pref)
 int64_t alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC;
 int64_t goat = PR_Now() - mStartTime;
 showTaskbarAlert = goat > alertIntervalUSec;
-@@ -2754,16 +2767,17 @@ nsDownload::SetState(DownloadState aStat
+@@ -2759,16 +2772,17 @@ nsDownload::SetState(DownloadState aStat
 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,
 message, !removeWhenDone,
 mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"),
 mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"),
 EmptyString(), EmptyString(), nullptr, mPrivate);
 if (fileURL &&
 NS_SUCCEEDED(fileURL->GetFile(getter_AddRefs(file))) &&
 diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
 --- a/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/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/button.xml          (widgets/button.xml)
 content/global/bindings/checkbox.xml        (widgets/checkbox.xml)
 content/global/bindings/colorpicker.xml     (widgets/colorpicker.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
 content/global/bindings/editor.xml          (widgets/editor.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/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/menulist.xml        (widgets/menulist.xml)
 content/global/bindings/notification.xml    (widgets/notification.xml)
 content/global/bindings/numberbox.xml       (widgets/numberbox.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
 content/global/bindings/progressmeter.xml   (widgets/progressmeter.xml)
 content/global/bindings/radio.xml           (widgets/radio.xml)
 content/global/bindings/remote-browser.xml  (widgets/remote-browser.xml)
 content/global/bindings/resizer.xml         (widgets/resizer.xml)
 content/global/bindings/scrollbox.xml       (widgets/scrollbox.xml)
 diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/content/widgets/dialog-kde.xml
-@@ -0,0 +1,460 @@
+@@ -0,0 +1,463 @@
 +<?xml version="1.0"?>
 +<!-- 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
 +   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 +
 +        <xul:spacer anonid="spacer" flex="1"/>
 +        <xul:button dlgtype="cancel" class="dialog-button"/>
 +        <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/>
 +#elif XP_UNIX
 +                >
-+	<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:spacer anonid="spacer" flex="1"/>
 +	<xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/>
 +	<xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
 +	<xul:button dlgtype="cancel" class="dialog-button"/>
 +
 +      <method name="postLoadInit">
 +        <parameter name="aEvent"/>
 +        <body>
 +        <![CDATA[
++          let { AppConstants } =
++              Components.utils.import("resource://gre/modules/AppConstants.jsm", {});
++
 +          function focusInit() {
 +            const dialog = document.documentElement;
 +            const defaultButton = dialog.getButton(dialog.defaultButton);
 +            // give focus to the first focusable element in the dialog
 +            if (!document.commandDispatcher.focusedElement) {
 +                    // We don't want to focus on anonymous OK, Cancel, etc. buttons,
 +                    // so return focus to the tab itself
 +                    initialFocusedElt.focus();
 +                  }
 +                }
-+#ifndef XP_MACOSX
++                else if (AppConstants.platform != "macosx" &&
-+                else if (focusedElt.hasAttribute("dlgtype") && focusedElt != defaultButton) {
++                         focusedElt.hasAttribute("dlgtype") && focusedElt != defaultButton) {
 +                  defaultButton.focus();
 +                }
-+#endif
 +              }
 +            }
 +
 +            try {
 +              if (defaultButton)
 +
 +            // hide/show the buttons we want
 +            for (dlgtype in buttons)
 +              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", {});
-+            var spacer = document.getAnonymousElementByAttribute(this, "anonid", "spacer");
++            // show the spacer on Windows only when the extra2 button is present
-+            spacer.removeAttribute("hidden");
++            if (AppConstants.platform == "win") {
-+            spacer.setAttribute("flex", shown["extra2"]?"1":"0");
++              var spacer = document.getAnonymousElementByAttribute(this, "anonid", "spacer");
-+#endif
++              spacer.removeAttribute("hidden");
-+
++              spacer.setAttribute("flex", shown["extra2"]?"1":"0");
++            }
 +          }
 +        ]]>
 +        </body>
 +      </method>
 +
 +</bindings>
 diff --git a/toolkit/content/widgets/preferences-kde.xml b/toolkit/content/widgets/preferences-kde.xml
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/content/widgets/preferences-kde.xml
-@@ -0,0 +1,1403 @@
+@@ -0,0 +1,1406 @@
 +<?xml version="1.0"?>
 +
 +<!DOCTYPE bindings [
 +  <!ENTITY % preferencesDTD SYSTEM "chrome://global/locale/preferences.dtd">
 +  %preferencesDTD;
 +          if (this.instantApply) {
 +            var docElt = document.documentElement;
 +            var acceptButton = docElt.getButton("accept");
 +            acceptButton.hidden = true;
 +            var cancelButton  = docElt.getButton("cancel");
-+#ifdef XP_MACOSX
++
-+            // no buttons on Mac except Help
++            let { AppConstants } =
-+            cancelButton.hidden = true;
++                Components.utils.import("resource://gre/modules/AppConstants.jsm", {});
-+            // Move Help button to the end
++            if (AppConstants.platform == "macosx") {
-+            document.getAnonymousElementByAttribute(this, "anonid", "spacer").hidden = true;
++              // no buttons on Mac except Help
-+            // Also, don't fire onDialogAccept on enter
++              cancelButton.hidden = true;
-+            acceptButton.disabled = true;
++              // Move Help button to the end
-+#else
++              document.getAnonymousElementByAttribute(this, "anonid", "spacer").hidden = true;
-+            // morph the Cancel button into the Close button
++              // Also, don't fire onDialogAccept on enter
-+            cancelButton.setAttribute ("icon", "close");
++              acceptButton.disabled = true;
-+            cancelButton.label = docElt.getAttribute("closebuttonlabel");
++            } else {
-+            cancelButton.accesskey = docElt.getAttribute("closebuttonaccesskey");
++              // morph the Cancel button into the Close button
-+#endif
++              cancelButton.setAttribute ("icon", "close");
++              cancelButton.label = docElt.getAttribute("closebuttonlabel");
++              cancelButton.accesskey = docElt.getAttribute("closebuttonaccesskey");
++            }
 +          }
 +        }
 +        this.setAttribute("animated", this._shouldAnimate ? "true" : "false");
 +        var panes = this.preferencePanes;
 +
 +      <field name="_initialized">false</field>
 +      <method name="_selectPane">
 +        <parameter name="aPaneElement"/>
 +        <body>
 +        <![CDATA[
-+#ifdef XP_MACOSX
++          let { AppConstants } =
-+          var paneTitle = aPaneElement.label;
++              Components.utils.import("resource://gre/modules/AppConstants.jsm", {});
-+          if (paneTitle != "")
++          if (AppConstants.platform == "macosx") {
-+            document.title = paneTitle;
++            var paneTitle = aPaneElement.label;
-+#endif
++            if (paneTitle != "")
++              document.title = paneTitle;
++          }
 +          var helpButton = document.documentElement.getButton("help");
 +          if (aPaneElement.helpTopic)
 +            helpButton.hidden = false;
 +          else
 +            helpButton.hidden = true;
 +      </method>
 +
 +      <property name="_shouldAnimate">
 +        <getter>
 +        <![CDATA[
++          let { AppConstants } =
++              Components.utils.import("resource://gre/modules/AppConstants.jsm", {});
 +          var psvc = Components.classes["@mozilla.org/preferences-service;1"]
 +                               .getService(Components.interfaces.nsIPrefBranch);
-+#ifdef XP_MACOSX
++          var animate = AppConstants.platform == "macosx";
-+          var animate = true;
-+#else
-+          var animate = false;
-+#endif
 +          try {
 +            animate = psvc.getBoolPref("browser.preferences.animateFadeIn");
 +          }
 +          catch (e) { }
 +          return animate;
 +
 +#endif // nsKDEUtils
 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
 --- a/uriloader/exthandler/moz.build
 +++ b/uriloader/exthandler/moz.build
-@@ -72,17 +72,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'ui
+@@ -75,17 +75,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'ui
 else:
 # These files can't be built in unified mode because they redefine LOG.
 SOURCES += [
 osdir + '/nsOSHelperAppService.cpp',
 ]
 UNIFIED_SOURCES += [
 'android/nsAndroidHandlerApp.cpp',
 'android/nsExternalSharingAppService.cpp',
 'android/nsExternalURLHandlerService.cpp',
 'android/nsMIMEInfoAndroid.cpp',
-@@ -125,16 +127,17 @@ include('/ipc/chromium/chromium-config.m
+@@ -129,16 +131,17 @@ include('/ipc/chromium/chromium-config.m
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
 '/dom/base',
 diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
 --- a/xpcom/components/moz.build
 +++ b/xpcom/components/moz.build
 @@ -47,12 +47,13 @@ FINAL_LIBRARY = 'xul'
-GENERATED_INCLUDES += ['..']
 LOCAL_INCLUDES += [
+'!..',
 '../base',
 '../build',
 '../ds',
 '../reflect/xptinfo',
 '/chrome',
 if CONFIG['MOZ_WIDGET_GTK']:
 CXXFLAGS += CONFIG['TK_CFLAGS']
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp
 +++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -47,16 +47,17 @@
+@@ -44,16 +44,17 @@
 #include "prproces.h"
 #include "nsIDirectoryEnumerator.h"
 #include "nsISimpleEnumerator.h"
 #include "private/pprio.h"
 #include "prlink.h"
 #include <Carbon/Carbon.h>
 #include "CocoaFileUtils.h"
 #include "prmem.h"
 #include "plbase64.h"
-@@ -1963,42 +1964,52 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1948,42 +1949,52 @@ nsLocalFile::SetPersistentDescriptor(con
 return InitWithNativePath(aPersistentDescriptor);
 #endif
 }
 NS_IMETHODIMP
 nsresult rv = CocoaFileUtils::RevealFileInFinder(url);
 ::CFRelease(url);
 return rv;
 }
 return NS_ERROR_FAILURE;
-@@ -2006,16 +2017,22 @@ nsLocalFile::Reveal()
+@@ -1991,16 +2002,22 @@ nsLocalFile::Reveal()
 return NS_ERROR_FAILURE;
 #endif
 }
 NS_IMETHODIMP

branch	firefox46
changeset 909	c6717354928b
parent 904	6a889427cd4f
child 916	2f9f2e040647