mozilla: comparison mozilla-kde.patch

equal deleted inserted replaced

-:ff9e20146e8b
+:66115255ad6f
 # HG changeset patch
-# Parent  f3e80d26a430dfa1c58421fb66144a3c23ffc166
+# Parent  0e88a32ef7263e76f6970bab17458130d1f3677f
 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
 int64_t alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC;
 int64_t goat = PR_Now() - mStartTime;
 showTaskbarAlert = goat > alertIntervalUSec;
-@@ -2763,16 +2776,17 @@ nsDownload::SetState(DownloadState aStat
+@@ -2764,16 +2777,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);
+EmptyString(), EmptyString(), nullptr, mPrivate,
+false /* requireInteraction */);
 }
 }
 }
 +      }
 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
-@@ -67,29 +67,33 @@ toolkit.jar:
+@@ -71,29 +71,33 @@ toolkit.jar:
-content/global/viewZoomOverlay.js
-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/datetimepopup.xml   (widgets/datetimepopup.xml)
+content/global/bindings/datetimebox.xml     (widgets/datetimebox.xml)
+content/global/bindings/datetimebox.css     (widgets/datetimebox.css)
 *  content/global/bindings/dialog.xml          (widgets/dialog.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/resizer.xml         (widgets/resizer.xml)
 content/global/bindings/richlistbox.xml     (widgets/richlistbox.xml)
 content/global/bindings/scale.xml           (widgets/scale.xml)
 content/global/bindings/scrollbar.xml       (widgets/scrollbar.xml)
 content/global/bindings/scrollbox.xml       (widgets/scrollbox.xml)
+@@ -113,9 +117,9 @@ toolkit.jar:
+content/global/bindings/videocontrols.css   (widgets/videocontrols.css)
+*  content/global/bindings/wizard.xml          (widgets/wizard.xml)
+#ifdef XP_MACOSX
+content/global/macWindowMenu.js
+#endif
+content/global/svg/svgBindings.xml          (/layout/svg/resources/content/svgBindings.xml)
+content/global/gmp-sources/eme-adobe.json   (gmp-sources/eme-adobe.json)
+content/global/gmp-sources/openh264.json    (gmp-sources/openh264.json)
+-   content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json)
+\ No newline at end of file
++   content/global/gmp-sources/widevinecdm.json (gmp-sources/widevinecdm.json)
 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,457 @@
 +
 +      <method name="centerWindowOnScreen">
 +        <body>
 +        <![CDATA[
 +          var xOffset = screen.availWidth/2 - window.outerWidth/2;
-+          var yOffset = screen.availHeight/2 - window.outerHeight/2; //(opener.outerHeight *2)/10;
++          var yOffset = screen.availHeight/2 - window.outerHeight/2;
 +
 +          xOffset = xOffset > 0 ? xOffset : 0;
 +          yOffset = yOffset > 0 ? yOffset : 0;
 +          window.moveTo(xOffset, yOffset);
 +        ]]>
 +</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,1411 @@
 +<?xml version="1.0"?>
 +
 +<!DOCTYPE bindings [
 +  <!ENTITY % preferencesDTD SYSTEM "chrome://global/locale/preferences.dtd">
 +  %preferencesDTD;
 +          return temp.nodeType == Node.ELEMENT_NODE ? temp : aStartElement;
 +        ]]>
 +        </body>
 +      </method>
 +
-+      <field name="DeferredTask" readonly="true">
++      <property name="DeferredTask" readonly="true">
-+        let targetObj = {};
++        <getter><![CDATA[
-+        Components.utils.import("resource://gre/modules/DeferredTask.jsm", targetObj);
++          let module = {};
-+        targetObj.DeferredTask;
++          Components.utils.import("resource://gre/modules/DeferredTask.jsm", module);
-+      </field>
++          Object.defineProperty(this, "DeferredTask", {
++            configurable: true,
++            enumerable: true,
++            writable: true,
++            value: module.DeferredTask
++          });
++          return module.DeferredTask;
++        ]]></getter>
++      </property>
 +      <method name="_deferredValueUpdate">
 +        <parameter name="aElement"/>
 +        <body>
 +        <![CDATA[
 +          delete aElement._deferredValueUpdateTask;
 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
 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
-@@ -44,16 +44,17 @@
+@@ -45,16 +45,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"
-@@ -1948,42 +1949,52 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1947,42 +1948,52 @@ nsLocalFile::SetPersistentDescriptor(con
 return InitWithNativePath(aPersistentDescriptor);
 #endif
 }
 NS_IMETHODIMP
 nsresult rv = CocoaFileUtils::RevealFileInFinder(url);
 ::CFRelease(url);
 return rv;
 }
 return NS_ERROR_FAILURE;
-@@ -1991,16 +2002,22 @@ nsLocalFile::Reveal()
+@@ -1990,16 +2001,22 @@ nsLocalFile::Reveal()
 return NS_ERROR_FAILURE;
 #endif
 }
 NS_IMETHODIMP

changeset 942	66115255ad6f
parent 935	9ae2b79d3bb1
child 944	ce8a98f8d8d7