/[packages]/updates/5/firefox/current/SOURCES/mozilla-kde.patch

Diff of /updates/5/firefox/current/SOURCES/mozilla-kde.patch

Parent Directory | Revision Log | View Patch Patch

-revision 1097033 by lmenut,
Wed Sep  7 20:02:01 2016 UTC
+revision 1097034 by neoclust,
Fri Apr 21 23:33:37 2017 UTC
 Line 1
  # HG changeset patch
- # Parent  797d5f17b080f54439602f107ecaf6b09a0ef5c1
+ # Parent  5f1979729aa3c6bc50f7097202991e73be677e5e
  Description: Add KDE integration to Firefox (toolkit parts)
  Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
  Author: Lubos Lunak <lunak@suse.com>
 Line 9 
 Bug: https://bugzilla.mozilla.org/show_b
  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"
 Line 27 
 diff --git a/modules/libpref/Preferences
   #include "prefread.h"
   #include "prefapi_private_data.h"
- @@ -1136,16 +1137,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
+ @@ -1174,16 +1175,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
   static nsresult pref_LoadPrefsInDirList(const char *listId)
   {
 Line 62 
 diff --git a/modules/libpref/Preferences
       return NS_OK;
     bool hasMore;
- @@ -1161,17 +1180,17 @@ static nsresult pref_LoadPrefsInDirList(
+ @@ -1199,17 +1218,17 @@ static nsresult pref_LoadPrefsInDirList(
       nsAutoCString leaf;
       path->GetNativeLeafName(leaf);
 Line 81 
 diff --git a/modules/libpref/Preferences
   {
     nsZipItemPtr<char> manifest(jarReader, name, true);
     NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
- @@ -1265,26 +1284,38 @@ static nsresult pref_InitInitialObjects(
+ @@ -1303,24 +1322,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)
 Line 91 
 diff --git a/modules/libpref/Preferences
   #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)
-Line 143 
 diff --git a/modules/libpref/moz.build b
+Line 141 
 diff --git a/modules/libpref/moz.build b
   DEFINES['OS_ARCH'] = CONFIG['OS_ARCH']
   DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT']
-  if CONFIG['GNU_CXX']:
+  FINAL_TARGET_PP_FILES += [
  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
-Line 189 
 diff --git a/python/mozbuild/mozpack/chr
+Line 187 
 diff --git a/python/mozbuild/mozpack/chr
  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']:
+ @@ -57,16 +57,17 @@ if not CONFIG['MOZ_SUITE']:
-          'nsDownloadManagerUI.js',
           'nsDownloadManagerUI.manifest',
       ]
-Line 198 
 diff --git a/toolkit/components/download
+Line 195 
 diff --git a/toolkit/components/download
   LOCAL_INCLUDES += [
       '../protobuf',
- -    '/ipc/chromium/src'
+      '/ipc/chromium/src',
- +    '/ipc/chromium/src',
+ +    '/toolkit/xre',
- +    '/toolkit/xre'
+      'chromium'
   ]
   DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True
   DEFINES['GOOGLE_PROTOBUF_NO_STATIC_INITIALIZER'] = True
   CXXFLAGS += CONFIG['TK_CFLAGS']
  diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
  --- a/toolkit/components/downloads/nsDownloadManager.cpp
  +++ b/toolkit/components/downloads/nsDownloadManager.cpp
- @@ -51,16 +51,20 @@
+ @@ -52,16 +52,20 @@
   #ifdef XP_WIN
   #include <shlobj.h>
   #include "nsWindowsHelpers.h"
-Line 228 
 diff --git a/toolkit/components/download
+Line 226 
 diff --git a/toolkit/components/download
   #endif
   #ifdef MOZ_WIDGET_ANDROID
-  #include "AndroidBridge.h"
+  #include "FennecJNIWrappers.h"
   #endif
- @@ -2719,16 +2723,25 @@ nsDownload::SetState(DownloadState aStat
+ @@ -2723,16 +2727,25 @@ nsDownload::SetState(DownloadState aStat
         nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
         // Master pref to control this function.
-Line 257 
 diff --git a/toolkit/components/download
+Line 255 
 diff --git a/toolkit/components/download
           int64_t goat = PR_Now() - mStartTime;
           showTaskbarAlert = goat > alertIntervalUSec;
- @@ -2759,16 +2772,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 */);
               }
           }
         }
-Line 278 
 diff --git a/toolkit/components/download
+Line 276 
 diff --git a/toolkit/components/download
  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:
+ @@ -70,29 +70,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/dialog.xml          (widgets/dialog.xml)
+     content/global/bindings/datetimepopup.xml   (widgets/datetimepopup.xml)
- +*+ content/global/bindings/dialog-kde.xml      (widgets/dialog-kde.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/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)
-Line 316 
 diff --git a/toolkit/content/widgets/dia
+Line 314 
 diff --git a/toolkit/content/widgets/dia
  new file mode 100644
  --- /dev/null
  +++ b/toolkit/content/widgets/dialog-kde.xml
- @@ -0,0 +1,460 @@
+ @@ -0,0 +1,457 @@
  +<?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
-Line 327 
 new file mode 100644
+Line 325 
 new file mode 100644
  +          xmlns="http://www.mozilla.org/xbl"
  +          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  +          xmlns:xbl="http://www.mozilla.org/xbl">
  +
  +  <binding id="dialog" extends="chrome://global/content/bindings/general.xml#root-element">
  +    <resources>
  +      <stylesheet src="chrome://global/skin/dialog.css"/>
-Line 336 
 new file mode 100644
+Line 334 
 new file mode 100644
  +      <xul:vbox class="box-inherit dialog-content-box" flex="1">
  +        <children/>
  +      </xul:vbox>
  +
  +      <xul:hbox class="dialog-button-box" anonid="buttons"
  +                xbl:inherits="pack=buttonpack,align=buttonalign,dir=buttondir,orient=buttonorient"
  +#ifdef XP_UNIX_GNOME
-Line 350 
 new file mode 100644
+Line 348 
 new file mode 100644
  +        <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:button dlgtype="extra2" class="dialog-button" hidden="true"/>
- +       <xul:spacer anonid="spacer" flex="1"/>
+ +        <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"/>
- +       <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
+ +        <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
  +#else
  +                pack="end">
  +        <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
-Line 386 
 new file mode 100644
+Line 384 
 new file mode 100644
  +        <![CDATA[
  +          if (this.hasAttribute("defaultButton"))
  +            return this.getAttribute("defaultButton");
- +          else // default to the accept button
+ +          return "accept";  // default to the accept button
- +            return "accept";
  +        ]]>
  +        </getter>
  +        <setter>
-Line 405 
 new file mode 100644
+Line 402 
 new file mode 100644
  +        ]]>
  +        </body>
  +      </method>
  +
  +      <method name="cancelDialog">
  +        <body>
  +        <![CDATA[
-Line 413 
 new file mode 100644
+Line 410 
 new file mode 100644
  +        ]]>
  +        </body>
  +      </method>
  +
  +      <method name="getButton">
  +        <parameter name="aDlgType"/>
  +        <body>
-Line 463 
 new file mode 100644
+Line 460 
 new file mode 100644
  +        <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);
-Line 516 
 new file mode 100644
+Line 513 
 new file mode 100644
  +                    initialFocusedElt.focus();
  +                  }
  +                }
- +#ifndef XP_MACOSX
+ +                else if (!/Mac/.test(navigator.platform) &&
- +                else if (focusedElt.hasAttribute("dlgtype") && focusedElt != defaultButton) {
+ +                         focusedElt.hasAttribute("dlgtype") && focusedElt != defaultButton) {
  +                  defaultButton.focus();
  +                }
- +#endif
  +              }
  +            }
  +
-Line 534 
 new file mode 100644
+Line 530 
 new file mode 100644
  +          setTimeout(focusInit, 0);
  +        ]]>
  +        </body>
  +      </method>
  +
  +      <property name="mStrBundle">
  +        <getter>
-Line 549 
 new file mode 100644
+Line 545 
 new file mode 100644
  +          return this._mStrBundle;
  +        ]]></getter>
  +      </property>
  +
  +      <method name="_configureButtons">
  +        <parameter name="aButtons"/>
  +        <body>
-Line 602 
 new file mode 100644
+Line 598 
 new file mode 100644
  +              else
  +                switch (dlgtype) {
  +                  case "accept":
- +                    button.setAttribute("icon","accept");
+ +                    button.setAttribute("icon", "accept");
  +                    break;
  +                  case "cancel":
- +                    button.setAttribute("icon","cancel");
+ +                    button.setAttribute("icon", "cancel");
  +                    break;
  +                  case "disclosure":
- +                    button.setAttribute("icon","properties");
+ +                    button.setAttribute("icon", "properties");
  +                    break;
  +                  case "help":
- +                    button.setAttribute("icon","help");
+ +                    button.setAttribute("icon", "help");
  +                    break;
  +                  default:
  +                    break;
-Line 621 
 new file mode 100644
+Line 617 
 new file mode 100644
  +
  +          // ensure that hitting enter triggers the default button command
  +          this.defaultButton = this.defaultButton;
  +
  +          // if there is a special button configuration, use it
  +          if (aButtons) {
  +            // expect a comma delimited list of dlgtype values
-Line 634 
 new file mode 100644
+Line 630 
 new file mode 100644
  +              shown[list[i].replace(/ /g, "")] = true;
  +
  +            // hide/show the buttons we want
  +            for (dlgtype in buttons)
  +              buttons[dlgtype].hidden = !shown[dlgtype];
  +
- +#ifdef XP_WIN
+ +            // show the spacer on Windows only when the extra2 button is present
- +#           show the spacer on Windows only when the extra2 button is present
+ +            if (/Win/.test(navigator.platform)) {
- +            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>
-Line 681 
 new file mode 100644
+Line 676 
 new file mode 100644
  +        ]]>
  +        </body>
  +      </method>
  +
  +      <method name="_doButtonCommand">
  +        <parameter name="aDlgType"/>
  +        <body>
-Line 705 
 new file mode 100644
+Line 700 
 new file mode 100644
  +        ]]>
  +        </body>
  +      </method>
  +
  +      <method name="_fireButtonEvent">
  +        <parameter name="aDlgType"/>
  +        <body>
  +        <![CDATA[
  +          var event = document.createEvent("Events");
  +          event.initEvent("dialog"+aDlgType, true, true);
  +
  +          // handle dom event handlers
  +          var noCancel = this.dispatchEvent(event);
  +
  +          // handle any xml attribute event handlers
  +          var handler = this.getAttribute("ondialog"+aDlgType);
  +          if (handler != "") {
-Line 724 
 new file mode 100644
+Line 719 
 new file mode 100644
  +            if (returned == false)
  +              noCancel = false;
  +          }
  +
  +          return noCancel;
  +        ]]>
  +        </body>
-Line 745 
 new file mode 100644
+Line 740 
 new file mode 100644
  +      </method>
  +
  +    </implementation>
  +
  +    <handlers>
  +      <handler event="keypress" keycode="VK_RETURN"
  +               group="system" action="this._hitEnter(event);"/>
-Line 781 
 diff --git a/toolkit/content/widgets/pre
+Line 776 
 diff --git a/toolkit/content/widgets/pre
  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 [
-Line 848 
 new file mode 100644
+Line 843 
 new file mode 100644
  +        ]]>
  +        </body>
  +      </method>
  +
  +      <method name="fireChangedEvent">
  +        <parameter name="aPreference"/>
  +        <body>
-Line 865 
 new file mode 100644
+Line 860 
 new file mode 100644
  +        ]]>
  +        </body>
  +      </method>
  +
  +      <field name="service">
  +        Components.classes["@mozilla.org/preferences-service;1"]
  +                  .getService(Components.interfaces.nsIPrefService);
-Line 915 
 new file mode 100644
+Line 910 
 new file mode 100644
  +            .addObserver(this.name, this.preferences, false);
  +        // In non-instant apply mode, we must try and use the last saved state
  +        // from any previous opens of a child dialog instead of the value from
  +        // preferences, to pick up any edits a user may have made.
  +
  +        var secMan = Components.classes["@mozilla.org/scriptsecuritymanager;1"]
  +                    .getService(Components.interfaces.nsIScriptSecurityManager);
  +        if (this.preferences.type == "child" &&
  +            !this.instantApply && window.opener &&
  +            secMan.isSystemPrincipal(window.opener.document.nodePrincipal)) {
  +          var pdoc = window.opener.document;
-Line 951 
 new file mode 100644
+Line 946 
 new file mode 100644
  +      <field name="_constructed">false</field>
  +      <property name="instantApply">
  +        <getter>
+ +          if (this.getAttribute("instantApply") == "false")
+ +            return false;
  +          return this.getAttribute("instantApply") == "true" || this.preferences.instantApply;
  +        </getter>
  +      </property>
-Line 960 
 new file mode 100644
+Line 957 
 new file mode 100644
  +        <setter>
  +          if (val == this.name)
  +            return val;
  +
  +          this.preferences.rootBranchInternal
  +              .removeObserver(this.name, this.preferences);
  +          this.setAttribute('name', val);
  +          this.preferences.rootBranchInternal
  +              .addObserver(val, this.preferences, false);
  +
  +          return val;
  +        </setter>
  +      </property>
-Line 993 
 new file mode 100644
+Line 990 
 new file mode 100644
  +        </body>
  +      </method>
  +      <property name="value" onget="return this._value" onset="return this._setValue(val);"/>
  +
  +      <property name="locked">
  +        <getter>
  +          return this.preferences.rootBranch.prefIsLocked(this.name);
  +        </getter>
  +      </property>
  +
  +      <property name="disabled">
  +        <getter>
  +          return this.getAttribute("disabled") == "true";
  +        </getter>
  +        <setter>
  +        <![CDATA[
  +          if (val)
  +            this.setAttribute("disabled", "true");
  +          else
  +            this.removeAttribute("disabled");
-Line 1017 
 new file mode 100644
+Line 1014 
 new file mode 100644
  +          var elements = document.getElementsByAttribute("preference", this.id);
  +          for (var i = 0; i < elements.length; ++i) {
  +            elements[i].disabled = val;
  +
  +            var labels = document.getElementsByAttribute("control", elements[i].id);
  +            for (var j = 0; j < labels.length; ++j)
  +              labels[j].disabled = val;
  +          }
  +
  +          return val;
  +        ]]>
  +        </setter>
  +      </property>
  +
  +      <property name="tabIndex">
  +        <getter>
  +          return parseInt(this.getAttribute("tabindex"));
  +        </getter>
  +        <setter>
  +        <![CDATA[
  +          if (val)
  +            this.setAttribute("tabindex", val);
  +          else
  +            this.removeAttribute("tabindex");
-Line 1045 
 new file mode 100644
+Line 1042 
 new file mode 100644
  +          var elements = document.getElementsByAttribute("preference", this.id);
  +          for (var i = 0; i < elements.length; ++i) {
  +            elements[i].tabIndex = val;
  +
  +            var labels = document.getElementsByAttribute("control", elements[i].id);
  +            for (var j = 0; j < labels.length; ++j)
  +              labels[j].tabIndex = val;
  +          }
  +
  +          return val;
  +        ]]>
  +        </setter>
-Line 1064 
 new file mode 100644
+Line 1061 
 new file mode 100644
  +        ]]>
  +        </getter>
  +      </property>
  +
  +      <method name="reset">
  +        <body>
  +          // defer reset until preference update
-Line 1072 
 new file mode 100644
+Line 1069 
 new file mode 100644
  +        </body>
  +      </method>
  +
  +      <field name="_useDefault">false</field>
  +      <property name="defaultValue">
  +        <getter>
  +        <![CDATA[
-Line 1083 
 new file mode 100644
+Line 1080 
 new file mode 100644
  +        ]]>
  +        </getter>
  +      </property>
  +
  +      <property name="_branch">
  +        <getter>
  +          return this._useDefault ? this.preferences.defaultBranch : this.preferences.rootBranch;
  +        </getter>
  +      </property>
  +
  +      <field name="batching">false</field>
  +
  +      <method name="_reportUnknownType">
  +        <body>
  +        <![CDATA[
  +          var consoleService = Components.classes["@mozilla.org/consoleservice;1"]
  +                                         .getService(Components.interfaces.nsIConsoleService);
  +          var msg = "<preference> with id='" + this.id + "' and name='" +
  +                    this.name + "' has unknown type '" + this.type + "'.";
  +          consoleService.logStringMessage(msg);
  +        ]]>
  +        </body>
  +      </method>
  +
  +      <property name="valueFromPreferences">
  +        <getter>
  +        <![CDATA[
-Line 1188 
 new file mode 100644
+Line 1185 
 new file mode 100644
  +              if (!lf.exists())
  +                lf.initWithPath(val);
  +            }
  +            else
  +              lf = val.QueryInterface(Components.interfaces.nsILocalFile);
  +            this.preferences.rootBranch
  +                .setComplexValue(this.name, Components.interfaces.nsILocalFile, lf);
-Line 1202 
 new file mode 100644
+Line 1199 
 new file mode 100644
  +        ]]>
  +        </setter>
  +      </property>
  +
  +      <method name="setElementValue">
  +        <parameter name="aElement"/>
  +        <body>
-Line 1219 
 new file mode 100644
+Line 1216 
 new file mode 100644
  +            try {
  +              var event = document.createEvent("Events");
  +              event.initEvent("syncfrompreference", true, true);
  +              var f = new Function ("event",
  +                                    aElement.getAttribute("onsyncfrompreference"));
  +              rv = f.call(aElement, event);
  +            }
-Line 1227 
 new file mode 100644
+Line 1224 
 new file mode 100644
  +              Components.utils.reportError(e);
  +            }
  +          }
- +          var val = rv !== undefined ? rv : (this.instantApply ? this.valueFromPreferences : this.value);
+ +          var val = rv;
+ +          if (val === undefined)
+ +            val = this.instantApply ? this.valueFromPreferences : this.value;
  +          // if the preference is marked for reset, show default value in UI
  +          if (val === undefined)
  +            val = this.defaultValue;
  +
  +          /**
  +           * Initialize a UI element property with a value. Handles the case
  +           * where an element has not yet had a XBL binding attached for it and
  +           * the property setter does not yet exist by setting the same attribute
  +           * on the XUL element using DOM apis and assuming the element's
  +           * constructor or property getters appropriately handle this state.
  +           */
  +          function setValue(element, attribute, value) {
  +            if (attribute in element)
  +              element[attribute] = value;
  +            else
  +              element.setAttribute(attribute, value);
-Line 1272 
 new file mode 100644
+Line 1271 
 new file mode 100644
  +            try {
  +              var event = document.createEvent("Events");
  +              event.initEvent("synctopreference", true, true);
  +              var f = new Function ("event",
  +                                    aElement.getAttribute("onsynctopreference"));
  +              var rv = f.call(aElement, event);
  +              if (rv !== undefined)
  +                return rv;
  +            }
  +            catch (e) {
  +              Components.utils.reportError(e);
  +            }
  +          }
  +
  +          /**
  +           * Read the value of an attribute from an element, assuming the
  +           * attribute is a property on the element's node API. If the property
  +           * is not present in the API, then assume its value is contained in
  +           * an attribute, as is the case before a binding has been attached.
-Line 1312 
 new file mode 100644
+Line 1311 
 new file mode 100644
  +        ]]>
  +        </body>
  +      </method>
  +
  +      <method name="isElementEditable">
  +        <parameter name="aElement"/>
  +        <body>
-Line 1328 
 new file mode 100644
+Line 1327 
 new file mode 100644
  +            return true;
  +          }
  +          return aElement.getAttribute("preference-editable") == "true";
  +        ]]>
  +        </body>
  +      </method>
  +
  +      <method name="updateElements">
  +        <body>
  +        <![CDATA[
  +          if (!this.id)
  +            return;
  +
  +          // This "change" event handler tracks changes made to preferences by
  +          // sources other than the user in this window.
  +          var elements = document.getElementsByAttribute("preference", this.id);
  +          for (var i = 0; i < elements.length; ++i)
  +            this.setElementValue(elements[i]);
  +        ]]>
  +        </body>
  +      </method>
  +    </implementation>
  +
  +    <handlers>
  +      <handler event="change">
  +        this.updateElements();
-Line 1415 
 new file mode 100644
+Line 1414 
 new file mode 100644
  +            var acceptButton = docElt.getButton("accept");
  +            acceptButton.hidden = true;
  +            var cancelButton  = docElt.getButton("cancel");
- +#ifdef XP_MACOSX
+ +            if (/Mac/.test(navigator.platform)) {
- +            // 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");
-Line 1496 
 new file mode 100644
+Line 1495 
 new file mode 100644
  +                onget="return document.getAnonymousElementByAttribute(this, 'class', 'paneDeckContainer');"/>
  +      <property name="_selector"
  +                onget="return document.getAnonymousElementByAttribute(this, 'anonid', 'selector');"/>
  +      <property name="lastSelected"
  +                onget="return this.getAttribute('lastSelected');">
  +        <setter>
  +          this.setAttribute("lastSelected", val);
  +          document.persist(this.id, "lastSelected");
  +          return val;
  +        </setter>
  +      </property>
  +      <property name="currentPane"
  +                onset="return this._currentPane = val;">
  +        <getter>
  +          if (!this._currentPane)
  +            this._currentPane = this.preferencePanes[0];
  +
  +          return this._currentPane;
  +        </getter>
  +      </property>
  +      <field name="_currentPane">null</field>
  +
  +
  +      <method name="_makePaneButton">
  +        <parameter name="aPaneElement"/>
  +        <body>
-Line 1547 
 new file mode 100644
+Line 1546 
 new file mode 100644
  +            {
  +              this._pane = aPane;
  +            }
  +            OverlayLoadObserver.prototype = {
  +              _outer: this,
  +              observe: function (aSubject, aTopic, aData)
  +              {
  +                this._pane.loaded = true;
  +                this._outer._fireEvent("paneload", this._pane);
  +                this._outer._selectPane(this._pane);
  +              }
  +            };
  +
  +            var obs = new OverlayLoadObserver(aPaneElement);
  +            document.loadOverlay(aPaneElement.src, obs);
  +          }
-Line 1565 
 new file mode 100644
+Line 1564 
 new file mode 100644
  +        ]]>
  +        </body>
  +      </method>
  +
  +      <method name="_fireEvent">
  +        <parameter name="aEventName"/>
  +        <parameter name="aTarget"/>
  +        <body>
  +        <![CDATA[
  +          // Panel loaded, synthesize a load event.
  +          try {
  +            var event = document.createEvent("Events");
  +            event.initEvent(aEventName, true, true);
-Line 1582 
 new file mode 100644
+Line 1581 
 new file mode 100644
  +              if (rv == false)
  +                cancel = true;
  +            }
  +            return !cancel;
  +          }
  +          catch (e) {
  +            Components.utils.reportError(e);
  +          }
  +          return false;
  +        ]]>
  +        </body>
  +      </method>
  +
  +      <field name="_initialized">false</field>
  +      <method name="_selectPane">
  +        <parameter name="aPaneElement"/>
  +        <body>
  +        <![CDATA[
- +#ifdef XP_MACOSX
+ +          if (/Mac/.test(navigator.platform)) {
- +          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");
  +          if (aPaneElement.helpTopic)
  +            helpButton.hidden = false;
  +          else
  +            helpButton.hidden = true;
  +
  +          // Find this pane's index in the deck and set the deck's
  +          // selectedIndex to that value to switch to it.
  +          var prefpanes = this.preferencePanes;
  +          for (var i = 0; i < prefpanes.length; ++i) {
  +            if (prefpanes[i] == aPaneElement) {
  +              this._paneDeck.selectedIndex = i;
  +
  +              if (this.type != "child") {
  +                if (aPaneElement.hasAttribute("flex") && this._shouldAnimate &&
  +                    prefpanes.length > 1)
-Line 1667 
 new file mode 100644
+Line 1666 
 new file mode 100644
  +        ]]>
  +        </body>
  +      </method>
  +
  +      <property name="_shouldAnimate">
  +        <getter>
  +        <![CDATA[
  +          var psvc = Components.classes["@mozilla.org/preferences-service;1"]
  +                               .getService(Components.interfaces.nsIPrefBranch);
- +#ifdef XP_MACOSX
+ +          var animate = /Mac/.test(navigator.platform);
- +          var animate = true;
- +#else
- +          var animate = false;
- +#endif
  +          try {
  +            animate = psvc.getBoolPref("browser.preferences.animateFadeIn");
  +          }
-Line 1686 
 new file mode 100644
+Line 1681 
 new file mode 100644
  +        ]]>
  +        </getter>
  +      </property>
  +
  +      <method name="animate">
  +        <parameter name="aOldPane"/>
  +        <parameter name="aNewPane"/>
-Line 1694 
 new file mode 100644
+Line 1689 
 new file mode 100644
  +        <![CDATA[
  +          // if we are already resizing, use currentHeight
  +          var oldHeight = this._currentHeight ? this._currentHeight : aOldPane.contentHeight;
  +
  +          this._multiplier = aNewPane.contentHeight > oldHeight ? 1 : -1;
  +          var sizeDelta = Math.abs(oldHeight - aNewPane.contentHeight);
  +          this._animateRemainder = sizeDelta % this._animateIncrement;
-Line 1703 
 new file mode 100644
+Line 1698 
 new file mode 100644
  +        ]]>
  +        </body>
  +      </method>
  +
  +      <property name="_sizeIncrement">
  +        <getter>
  +        <![CDATA[
-Line 1713 
 new file mode 100644
+Line 1708 
 new file mode 100644
  +          if ((this._multiplier > 0 && this._currentHeight >= lastSelectedPane.contentHeight) ||
  +              (this._multiplier < 0 && this._currentHeight <= lastSelectedPane.contentHeight))
  +            return 0;
  +
  +          if ((this._multiplier > 0 && newHeight > lastSelectedPane.contentHeight) ||
  +              (this._multiplier < 0 && newHeight < lastSelectedPane.contentHeight))
  +            increment = this._animateRemainder * this._multiplier;
-Line 1721 
 new file mode 100644
+Line 1716 
 new file mode 100644
  +        ]]>
  +        </getter>
  +      </property>
  +
  +      <method name="notify">
  +        <parameter name="aTimer"/>
  +        <body>
  +        <![CDATA[
  +          if (!document)
  +            aTimer.cancel();
  +
  +          if (aTimer == this._animateTimer) {
  +            var increment = this._sizeIncrement;
  +            if (increment != 0) {
-Line 1752 
 new file mode 100644
+Line 1747 
 new file mode 100644
  +        ]]>
  +        </body>
  +      </method>
  +
  +      <method name="_setUpAnimationTimer">
  +        <parameter name="aStartHeight"/>
  +        <body>
  +        <![CDATA[
  +          if (!this._animateTimer)
  +            this._animateTimer = Components.classes["@mozilla.org/timer;1"]
  +                                           .createInstance(Components.interfaces.nsITimer);
  +          else
  +            this._animateTimer.cancel();
  +          this._currentHeight = aStartHeight;
  +
  +          this._animateTimer.initWithCallback(this, this._animateDelay,
  +                                              Components.interfaces.nsITimer.TYPE_REPEATING_SLACK);
  +        ]]>
  +        </body>
  +      </method>
  +
  +      <method name="_setUpFadeTimer">
  +        <body>
  +        <![CDATA[
  +          if (!this._fadeTimer)
  +            this._fadeTimer = Components.classes["@mozilla.org/timer;1"]
  +                                        .createInstance(Components.interfaces.nsITimer);
  +          else
  +            this._fadeTimer.cancel();
  +
  +          this._fadeTimer.initWithCallback(this, this._fadeDelay,
  +                                           Components.interfaces.nsITimer.TYPE_REPEATING_SLACK);
  +        ]]>
  +        </body>
  +      </method>
  +
  +      <field name="_animateTimer">null</field>
  +      <field name="_fadeTimer">null</field>
  +      <field name="_animateDelay">15</field>
-Line 1800 
 new file mode 100644
+Line 1795 
 new file mode 100644
  +        <body>
  +        <![CDATA[
  +          this.appendChild(aPaneElement);
  +
  +          // Set up pane button
  +          this._makePaneButton(aPaneElement);
  +        ]]>
  +        </body>
  +      </method>
  +
  +      <method name="openSubDialog">
  +        <parameter name="aURL"/>
  +        <parameter name="aFeatures"/>
-Line 1815 
 new file mode 100644
+Line 1810 
 new file mode 100644
  +          return openDialog(aURL, "", "modal,centerscreen,resizable=no" + (aFeatures != "" ? ("," + aFeatures) : ""), aParams);
  +        </body>
  +      </method>
  +
  +      <method name="openWindow">
  +        <parameter name="aWindowType"/>
  +        <parameter name="aURL"/>
-Line 1844 
 new file mode 100644
+Line 1839 
 new file mode 100644
  +    <handlers>
  +      <handler event="dialogaccept">
  +      <![CDATA[
- +        if (!this._fireEvent("beforeaccept", this)){
+ +        if (!this._fireEvent("beforeaccept", this)) {
  +          return false;
  +        }
  +
-Line 1852 
 new file mode 100644
+Line 1847 
 new file mode 100644
  +                    .getService(Components.interfaces.nsIScriptSecurityManager);
  +        if (this.type == "child" && window.opener &&
  +            secMan.isSystemPrincipal(window.opener.document.nodePrincipal)) {
- +          var psvc = Components.classes["@mozilla.org/preferences-service;1"]
+ +          let psvc = Components.classes["@mozilla.org/preferences-service;1"]
  +                               .getService(Components.interfaces.nsIPrefBranch);
  +          var pdocEl = window.opener.document.documentElement;
  +          if (pdocEl.instantApply) {
- +            var panes = this.preferencePanes;
+ +            let panes = this.preferencePanes;
- +            for (var i = 0; i < panes.length; ++i)
+ +            for (let i = 0; i < panes.length; ++i)
  +              panes[i].writePreferences(true);
  +          }
  +          else {
  +            // Clone all the preferences elements from the child document and
  +            // insert them into the pane collection of the parent.
  +            var pdoc = window.opener.document;
  +            if (pdoc.documentElement.localName == "prefwindow") {
  +              var currentPane = pdoc.documentElement.currentPane;
  +              var id = window.location.href + "#childprefs";
  +              var childPrefs = pdoc.getElementById(id);
  +              if (!childPrefs) {
- +                var childPrefs = pdoc.createElement("preferences");
+ +                childPrefs = pdoc.createElement("preferences");
  +                currentPane.appendChild(childPrefs);
  +                childPrefs.id = id;
  +              }
- +              var panes = this.preferencePanes;
+ +              let panes = this.preferencePanes;
- +              for (var i = 0; i < panes.length; ++i) {
+ +              for (let i = 0; i < panes.length; ++i) {
  +                var preferences = panes[i].preferences;
  +                for (var j = 0; j < preferences.length; ++j) {
  +                  // Try to find a preference element for the same preference.
-Line 1905 
 new file mode 100644
+Line 1900 
 new file mode 100644
  +          }
  +        }
  +        else {
- +          var panes = this.preferencePanes;
+ +          let panes = this.preferencePanes;
  +          for (var i = 0; i < panes.length; ++i)
  +            panes[i].writePreferences(false);
  +
- +          var psvc = Components.classes["@mozilla.org/preferences-service;1"]
+ +          let psvc = Components.classes["@mozilla.org/preferences-service;1"]
  +                               .getService(Components.interfaces.nsIPrefService);
  +          psvc.savePrefFile(null);
  +        }
-Line 1951 
 new file mode 100644
+Line 1946 
 new file mode 100644
  +      </handler>
  +    </handlers>
  +  </binding>
  +
  +  <binding id="prefpane">
  +    <resources>
  +      <stylesheet src="chrome://global/skin/preferences.css"/>
-Line 1986 
 new file mode 100644
+Line 1981 
 new file mode 100644
  +        ]]>
  +        </body>
  +      </method>
  +
  +      <property name="src"
  +                onget="return this.getAttribute('src');"
  +                onset="this.setAttribute('src', val); return val;"/>
  +      <property name="selected"
  +                onget="return this.getAttribute('selected') == 'true';"
  +                onset="this.setAttribute('selected', val); return val;"/>
  +      <property name="image"
  +                onget="return this.getAttribute('image');"
  +                onset="this.setAttribute('image', val); return val;"/>
  +      <property name="label"
  +                onget="return this.getAttribute('label');"
  +                onset="this.setAttribute('label', val); return val;"/>
  +
  +      <property name="preferenceElements"
  +                onget="return this.getElementsByAttribute('preference', '*');"/>
  +      <property name="preferences"
-Line 2023 
 new file mode 100644
+Line 2018 
 new file mode 100644
  +      </property>
  +
  +      <field name="_loaded">false</field>
  +      <property name="loaded"
  +                onget="return !this.src ? true : this._loaded;"
  +                onset="this._loaded = val; return val;"/>
  +
  +      <method name="preferenceForElement">
  +        <parameter name="aElement"/>
  +        <body>
  +          return document.getElementById(aElement.getAttribute("preference"));
  +        </body>
  +      </method>
  +
  +      <method name="getPreferenceElement">
  +        <parameter name="aStartElement"/>
  +        <body>
  +        <![CDATA[
  +          var temp = aStartElement;
  +          while (temp && temp.nodeType == Node.ELEMENT_NODE &&
  +                 !temp.hasAttribute("preference"))
  +            temp = temp.parentNode;
  +          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>
-Line 2102 
 new file mode 100644
+Line 2105 
 new file mode 100644
  +        ]]>
  +        </body>
  +      </method>
  +
  +      <property name="contentHeight">
  +        <getter>
  +          var targetHeight = parseInt(window.getComputedStyle(this._content, "").height);
-Line 2117 
 new file mode 100644
+Line 2120 
 new file mode 100644
  +    </implementation>
  +    <handlers>
  +      <handler event="command">
  +        // This "command" event handler tracks changes made to preferences by
  +        // the user in this window.
  +        if (event.sourceEvent)
  +          event = event.sourceEvent;
  +        this.userChangedValue(event.target);
  +      </handler>
  +      <handler event="select">
  +        // This "select" event handler tracks changes made to colorpicker
  +        // preferences by the user in this window.
  +        if (event.target.localName == "colorpicker")
  +          this.userChangedValue(event.target);
  +      </handler>
  +      <handler event="change">
  +        // This "change" event handler tracks changes made to preferences by
  +        // the user in this window.
  +        this.userChangedValue(event.target);
  +      </handler>
  +      <handler event="input">
  +        // This "input" event handler tracks changes made to preferences by
  +        // the user in this window.
  +        this.userChangedValue(event.target);
  +      </handler>
-Line 2152 
 new file mode 100644
+Line 2155 
 new file mode 100644
  +            dump("*** No preference found for " + elements[i].getAttribute("preference") + "\n");
  +          }
  +        }
  +      ]]>
  +      </handler>
  +    </handlers>
  +  </binding>
  +
  +  <binding id="panebutton" role="xul:listitem"
  +           extends="chrome://global/content/bindings/radio.xml#radio">
  +    <resources>
-Line 2185 
 new file mode 100644
+Line 2188 
 new file mode 100644
  +#    PrefWindow II  (???)
  +#    PrefWindow I   (June 4, 1999)
  +#
+ diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downloads/nsHelperAppDlg.js
+ --- a/toolkit/mozapps/downloads/nsHelperAppDlg.js
+ +++ b/toolkit/mozapps/downloads/nsHelperAppDlg.js
+ @@ -627,17 +627,17 @@ nsUnknownContentTypeDialog.prototype = {
+        else
+          typeString = mimeInfo.MIMEType;
+      }
+      // When the length is unknown, contentLength would be -1
+      if (this.mLauncher.contentLength >= 0) {
+        let [size, unit] = DownloadUtils.
+                           convertByteUnits(this.mLauncher.contentLength);
+        type.value = this.dialogElement("strings")
+ -                       .getFormattedString("orderedFileSizeWithType",
+ +                       .getFormattedString("orderedFileSizeWithType",
+                                             [typeString, size, unit]);
+      }
+      else {
+        type.value = typeString;
+      }
+    },
+    // Returns true if opening the default application makes sense.
+ @@ -801,17 +801,17 @@ nsUnknownContentTypeDialog.prototype = {
+        switch (this.dialogElement("openHandler").selectedIndex) {
+        case 0:
+          // No app need be specified in this case.
+          ok = true;
+          break;
+        case 1:
+          // only enable the OK button if we have a default app to use or if
+          // the user chose an app....
+ -        ok = this.chosenApp || /\S/.test(this.dialogElement("otherHandler").getAttribute("path"));
+ +        ok = this.chosenApp || /\S/.test(this.dialogElement("otherHandler").getAttribute("path"));
+          break;
+        }
+      }
+      // Enable Ok button if ok to press.
+      this.mDialog.document.documentElement.getButton("accept").disabled = !ok;
+    },
+ @@ -1068,30 +1068,56 @@ nsUnknownContentTypeDialog.prototype = {
+            params.handlerApp.executable &&
+            params.handlerApp.executable.isFile()) {
+          // Remember the file they chose to run.
+          this.chosenApp = params.handlerApp;
+        }
+      }
+      else {
+  #if MOZ_WIDGET_GTK == 3
+ -      var nsIApplicationChooser = Components.interfaces.nsIApplicationChooser;
+ -      var appChooser = Components.classes["@mozilla.org/applicationchooser;1"]
+ -                                 .createInstance(nsIApplicationChooser);
+ -      appChooser.init(this.mDialog, this.dialogElement("strings").getString("chooseAppFilePickerTitle"));
+ -      var contentTypeDialogObj = this;
+ -      let appChooserCallback = function appChooserCallback_done(aResult) {
+ -        if (aResult) {
+ -           contentTypeDialogObj.chosenApp = aResult.QueryInterface(Components.interfaces.nsILocalHandlerApp);
+ +      // handle the KDE case which is implemented in the filepicker
+ +      // therefore falling back to Gtk2 like behaviour if KDE is running
+ +      // FIXME this should be better handled in the nsIApplicationChooser interface
+ +      var env = Components.classes["@mozilla.org/process/environment;1"]
+ +                          .getService(Components.interfaces.nsIEnvironment);
+ +      if (env.get('KDE_FULL_SESSION') == "true")
+ +      {
+ +        var nsIFilePicker = Components.interfaces.nsIFilePicker;
+ +        var fp = Components.classes["@mozilla.org/filepicker;1"]
+ +                           .createInstance(nsIFilePicker);
+ +        fp.init(this.mDialog,
+ +                this.dialogElement("strings").getString("chooseAppFilePickerTitle"),
+ +                nsIFilePicker.modeOpen);
+ +
+ +        fp.appendFilters(nsIFilePicker.filterApps);
+ +
+ +        if (fp.show() == nsIFilePicker.returnOK && fp.file) {
+ +          // Remember the file they chose to run.
+ +          var localHandlerApp =
+ +            Components.classes["@mozilla.org/uriloader/local-handler-app;1"].
+ +                       createInstance(Components.interfaces.nsILocalHandlerApp);
+ +          localHandlerApp.executable = fp.file;
+ +          this.chosenApp = localHandlerApp;
+          }
+ -        contentTypeDialogObj.finishChooseApp();
+ -      };
+ -      appChooser.open(this.mLauncher.MIMEInfo.MIMEType, appChooserCallback);
+ -      // The finishChooseApp is called from appChooserCallback
+ -      return;
+ +      } else {
+ +        var nsIApplicationChooser = Components.interfaces.nsIApplicationChooser;
+ +        var appChooser = Components.classes["@mozilla.org/applicationchooser;1"]
+ +                                   .createInstance(nsIApplicationChooser);
+ +        appChooser.init(this.mDialog, this.dialogElement("strings").getString("chooseAppFilePickerTitle"));
+ +        var contentTypeDialogObj = this;
+ +        let appChooserCallback = function appChooserCallback_done(aResult) {
+ +          if (aResult) {
+ +             contentTypeDialogObj.chosenApp = aResult.QueryInterface(Components.interfaces.nsILocalHandlerApp);
+ +          }
+ +          contentTypeDialogObj.finishChooseApp();
+ +        };
+ +        appChooser.open(this.mLauncher.MIMEInfo.MIMEType, appChooserCallback);
+ +        // The finishChooseApp is called from appChooserCallback
+ +        return;
+ +      }
+  #else
+        var nsIFilePicker = Components.interfaces.nsIFilePicker;
+        var fp = Components.classes["@mozilla.org/filepicker;1"]
+                           .createInstance(nsIFilePicker);
+        fp.init(this.mDialog,
+                this.dialogElement("strings").getString("chooseAppFilePickerTitle"),
+                nsIFilePicker.modeOpen);
  diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
  --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
  +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
-Line 2282 
 diff --git a/toolkit/system/unixproxy/ns
+Line 2396 
 diff --git a/toolkit/system/unixproxy/ns
  diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
  --- a/toolkit/xre/moz.build
  +++ b/toolkit/xre/moz.build
- @@ -48,17 +48,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'ui
+ @@ -40,17 +40,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
-  elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
+          'updaterfileutils_osx.mm',
-      EXPORTS += ['nsQAppInstance.h']
-      SOURCES += [
-          '!moc_nsNativeAppSupportQt.cpp',
-          'nsNativeAppSupportQt.cpp',
-          'nsQAppInstance.cpp',
       ]
-  elif CONFIG['MOZ_ENABLE_GTK']:
+  elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
+      UNIFIED_SOURCES += [
+          'nsNativeAppSupportDefault.cpp',
+          'UIKitDirProvider.mm',
+      ]
+  elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
  +    EXPORTS += ['nsKDEUtils.h']
       UNIFIED_SOURCES += [
  +        'nsKDEUtils.cpp',
-Line 2306 
 diff --git a/toolkit/xre/nsKDEUtils.cpp
+Line 2420 
 diff --git a/toolkit/xre/nsKDEUtils.cpp
  new file mode 100644
  --- /dev/null
  +++ b/toolkit/xre/nsKDEUtils.cpp
- @@ -0,0 +1,339 @@
+ @@ -0,0 +1,344 @@
  +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
  +/* 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
-Line 2327 
 new file mode 100644
+Line 2441 
 new file mode 100644
  +#include <sys/resource.h>
  +#include <unistd.h>
  +#include <X11/Xlib.h>
+ +// copied from X11/X.h as a hack since for an unknown
+ +// reason it's not picked up from X11/X.h
+ +#ifndef None
+ +#define None                 0L /* universal null resource or null atom */
+ +#endif
  +
  +//#define DEBUG_KDE
  +#ifdef DEBUG_KDE
-Line 2702 
 new file mode 100644
+Line 2821 
 new file mode 100644
  diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
  --- a/uriloader/exthandler/moz.build
  +++ b/uriloader/exthandler/moz.build
- @@ -75,17 +75,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'ui
+ @@ -77,17 +77,19 @@ else:
-  else:
-      # These files can't be built in unified mode because they redefine LOG.
       SOURCES += [
           osdir + '/nsOSHelperAppService.cpp',
       ]
+      if CONFIG['GNU_CXX']:
+          CXXFLAGS += ['-Wno-error=shadow']
-  if CONFIG['MOZ_ENABLE_GTK']:
+  if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
       UNIFIED_SOURCES += [
  +        'unix/nsCommonRegistry.cpp',
           'unix/nsGNOMERegistry.cpp',
-Line 2722 
 diff --git a/uriloader/exthandler/moz.bu
+Line 2841 
 diff --git a/uriloader/exthandler/moz.bu
           'android/nsExternalSharingAppService.cpp',
           'android/nsExternalURLHandlerService.cpp',
           'android/nsMIMEInfoAndroid.cpp',
- @@ -129,16 +131,17 @@ include('/ipc/chromium/chromium-config.m
+ @@ -123,16 +125,17 @@ include('/ipc/chromium/chromium-config.m
   FINAL_LIBRARY = 'xul'
-Line 2738 
 diff --git a/uriloader/exthandler/moz.bu
+Line 2857 
 diff --git a/uriloader/exthandler/moz.bu
       CXXFLAGS += CONFIG['TK_CFLAGS']
       CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
-  if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('qt', 'gtk2', 'gtk3'):
+  if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3'):
       CXXFLAGS += CONFIG['TK_CFLAGS']
  diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp
  new file mode 100644
-Line 2966 
 new file mode 100644
+Line 3085 
 new file mode 100644
  diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
  --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
  +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
- @@ -7,32 +7,35 @@
+ @@ -1,50 +1,53 @@
-  #ifdef MOZ_WIDGET_QT
+  /* -*- Mode: C++; tab-width: 3; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-  #if (MOZ_ENABLE_CONTENTACTION)
+   *
-  #include <contentaction/contentaction.h>
+   * This Source Code Form is subject to the terms of the Mozilla Public
-  #include "nsContentHandlerApp.h"
+   * License, v. 2.0. If a copy of the MPL was not distributed with this
-  #endif
+   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-  #endif
   #include "nsMIMEInfoUnix.h"
  -#include "nsGNOMERegistry.h"
-Line 2984 
 diff --git a/uriloader/exthandler/unix/n
+Line 3102 
 diff --git a/uriloader/exthandler/unix/n
   #ifdef MOZ_ENABLE_DBUS
   #include "nsDBusHandlerApp.h"
   #endif
-  #ifdef MOZ_WIDGET_QT
-  #include "nsMIMEInfoQt.h"
-  #endif
  +#if defined(XP_UNIX) && !defined(XP_MACOSX)
  +#include "nsKDEUtils.h"
  +#endif
-Line 2994 
 diff --git a/uriloader/exthandler/unix/n
+Line 3109 
 diff --git a/uriloader/exthandler/unix/n
   nsresult
   nsMIMEInfoUnix::LoadUriInternal(nsIURI * aURI)
   {
- -  nsresult rv = nsGNOMERegistry::LoadURL(aURI);
+ -  return nsGNOMERegistry::LoadURL(aURI);
- +  nsresult rv = nsCommonRegistry::LoadURL(aURI);
+ +  return nsCommonRegistry::LoadURL(aURI);
+  }
-  #ifdef MOZ_WIDGET_QT
-    if (NS_FAILED(rv)) {
-      rv = nsMIMEInfoQt::LoadUriInternal(aURI);
-    }
-  #endif
-    return rv;
+  NS_IMETHODIMP
- @@ -45,24 +48,24 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo
+  nsMIMEInfoUnix::GetHasDefaultHandler(bool *_retval)
+  {
+    // if mDefaultApplication is set, it means the application has been set from
     // either /etc/mailcap or ${HOME}/.mailcap, in which case we don't want to
     // give the GNOME answer.
     if (mDefaultApplication)
-Line 3032 
 diff --git a/uriloader/exthandler/unix/n
+Line 3144 
 diff --git a/uriloader/exthandler/unix/n
     if (*_retval)
       return NS_OK;
- @@ -97,16 +100,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+ @@ -79,16 +82,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
       ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get()));
     if (action.isValid()) {
       action.trigger();
-Line 3158 
 diff --git a/uriloader/exthandler/unix/n
+Line 3270 
 diff --git a/uriloader/exthandler/unix/n
  diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
  --- a/widget/gtk/moz.build
  +++ b/widget/gtk/moz.build
- @@ -86,16 +86,17 @@ else:
+ @@ -101,16 +101,17 @@ else:
   include('/ipc/chromium/chromium-config.mozbuild')
   FINAL_LIBRARY = 'xul'
-Line 3267 
 diff --git a/widget/gtk/nsFilePicker.cpp
+Line 3379 
 diff --git a/widget/gtk/nsFilePicker.cpp
       GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET));
     GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
-    const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
- @@ -595,8 +615,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+ @@ -603,8 +623,235 @@ nsFilePicker::Done(GtkWidget* file_choos
     if (mCallback) {
       mCallback->Done(result);
       mCallback = nullptr;
-Line 3531 
 diff --git a/widget/gtk/nsFilePicker.h b
+Line 3643 
 diff --git a/widget/gtk/nsFilePicker.h b
  diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
  --- a/xpcom/components/ManifestParser.cpp
  +++ b/xpcom/components/ManifestParser.cpp
- @@ -35,16 +35,17 @@
+ @@ -32,16 +32,17 @@
+  #include "nsTextFormatter.h"
+  #include "nsVersionComparator.h"
+  #include "nsXPCOMCIDInternal.h"
   #include "nsIConsoleService.h"
   #include "nsIScriptError.h"
   #include "nsIXULAppInfo.h"
   #include "nsIXULRuntime.h"
-  #ifdef MOZ_B2G_LOADER
-  #include "mozilla/XPTInterfaceInfoManager.h"
-  #endif
  +#include "nsKDEUtils.h"
-  #ifdef MOZ_B2G_LOADER
+  using namespace mozilla;
-  #define XPTONLY_MANIFEST &nsComponentManagerImpl::XPTOnlyManifestManifest
-  #define XPTONLY_XPT &nsComponentManagerImpl::XPTOnlyManifestXPT
+  struct ManifestDirective
-  #else
+  {
-  #define XPTONLY_MANIFEST nullptr
+    const char* directive;
-  #define XPTONLY_XPT nullptr
+    int argc;
-  #endif
- @@ -494,16 +495,17 @@ ParseManifest(NSLocationType aType, File
+ @@ -472,16 +473,17 @@ ParseManifest(NSLocationType aType, File
     NS_NAMED_LITERAL_STRING(kRemoteEnabled, "remoteenabled");
     NS_NAMED_LITERAL_STRING(kRemoteRequired, "remoterequired");
     NS_NAMED_LITERAL_STRING(kApplication, "application");
-Line 3567 
 diff --git a/xpcom/components/ManifestPa
+Line 3679 
 diff --git a/xpcom/components/ManifestPa
     NS_NAMED_LITERAL_STRING(kMain, "main");
     NS_NAMED_LITERAL_STRING(kContent, "content");
- @@ -554,44 +556,49 @@ ParseManifest(NSLocationType aType, File
+ @@ -532,44 +534,49 @@ ParseManifest(NSLocationType aType, File
           CopyUTF8toUTF16(s, abi);
           abi.Insert(char16_t('_'), 0);
           abi.Insert(osTarget, 0);
-Line 3582 
 diff --git a/xpcom/components/ManifestPa
+Line 3694 
 diff --git a/xpcom/components/ManifestPa
   #pragma warning(disable:4996) // VC12+ deprecates GetVersionEx
     OSVERSIONINFO info = { sizeof(OSVERSIONINFO) };
     if (GetVersionEx(&info)) {
-      nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"),
+      nsTextFormatter::ssprintf(osVersion, u"%ld.%ld",
                                 info.dwMajorVersion,
                                 info.dwMinorVersion);
     }
-Line 3591 
 diff --git a/xpcom/components/ManifestPa
+Line 3703 
 diff --git a/xpcom/components/ManifestPa
   #elif defined(MOZ_WIDGET_COCOA)
     SInt32 majorVersion = nsCocoaFeatures::OSXVersionMajor();
     SInt32 minorVersion = nsCocoaFeatures::OSXVersionMinor();
-    nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"),
+    nsTextFormatter::ssprintf(osVersion, u"%ld.%ld",
                               majorVersion,
                               minorVersion);
  +  desktop = NS_LITERAL_STRING("macosx");
   #elif defined(MOZ_WIDGET_GTK)
-    nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"),
+    nsTextFormatter::ssprintf(osVersion, u"%ld.%ld",
                               gtk_major_version,
                               gtk_minor_version);
  +  desktop = nsKDEUtils::kdeSession() ? NS_LITERAL_STRING("kde") : NS_LITERAL_STRING("gnome");
-Line 3606 
 diff --git a/xpcom/components/ManifestPa
+Line 3718 
 diff --git a/xpcom/components/ManifestPa
       mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build$VERSION",
                                                              "RELEASE",
                                                              osVersion);
-      isTablet = mozilla::widget::GeckoAppShell::IsTablet();
+      isTablet = java::GeckoAppShell::IsTablet();
     }
  +  desktop = NS_LITERAL_STRING("android");
   #endif
-Line 3617 
 diff --git a/xpcom/components/ManifestPa
+Line 3729 
 diff --git a/xpcom/components/ManifestPa
       process = kMain;
     }
- @@ -694,25 +701,27 @@ ParseManifest(NSLocationType aType, File
+ @@ -672,25 +679,27 @@ ParseManifest(NSLocationType aType, File
       TriState stOsVersion = eUnspecified;
       TriState stOs = eUnspecified;
       TriState stABI = eUnspecified;
-Line 3645 
 diff --git a/xpcom/components/ManifestPa
+Line 3757 
 diff --git a/xpcom/components/ManifestPa
         }
   #if defined(MOZ_WIDGET_ANDROID)
- @@ -762,16 +771,17 @@ ParseManifest(NSLocationType aType, File
+ @@ -740,16 +749,17 @@ ParseManifest(NSLocationType aType, File
       }
       if (!ok ||
-Line 3666 
 diff --git a/xpcom/components/ManifestPa
+Line 3778 
 diff --git a/xpcom/components/ManifestPa
  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'
+ @@ -44,12 +44,13 @@ FINAL_LIBRARY = 'xul'
   LOCAL_INCLUDES += [
       '!..',
       '../base',
-Line 3678 
 diff --git a/xpcom/components/moz.build
+Line 3790 
 diff --git a/xpcom/components/moz.build
  +    '/toolkit/xre'
   ]
-  if CONFIG['MOZ_WIDGET_GTK']:
+  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
- @@ -47,16 +47,17 @@
+ @@ -46,16 +46,17 @@
   #include "prproces.h"
   #include "nsIDirectoryEnumerator.h"
   #include "nsISimpleEnumerator.h"
-Line 3701 
 diff --git a/xpcom/io/nsLocalFileUnix.cp
+Line 3813 
 diff --git a/xpcom/io/nsLocalFileUnix.cp
   #include "prmem.h"
   #include "plbase64.h"
- @@ -1963,42 +1964,52 @@ nsLocalFile::SetPersistentDescriptor(con
+ @@ -1948,42 +1949,52 @@ nsLocalFile::SetPersistentDescriptor(con
     return InitWithNativePath(aPersistentDescriptor);
   #endif
   }
-Line 3760 
 diff --git a/xpcom/io/nsLocalFileUnix.cp
+Line 3872 
 diff --git a/xpcom/io/nsLocalFileUnix.cp
       return rv;
     }
     return NS_ERROR_FAILURE;
- @@ -2006,16 +2017,22 @@ nsLocalFile::Reveal()
+ @@ -1991,16 +2002,22 @@ nsLocalFile::Reveal()
     return NS_ERROR_FAILURE;
   #endif
   }

 Legend:



Removed from v.1097033
 


changed lines


 
Added in v.1097034
 Legend:



Removed from v.1097033
 


changed lines


 
Added in v.1097034
-Removed from v.1097033
+Added in v.1097034

	ViewVC Help
Powered by ViewVC 1.1.30