mozilla: comparison mozilla-kde.patch

equal deleted inserted replaced

-:b441942b2a3f
+:72ba5129e5fd
 nsAutoCString leaf;
 path->GetNativeLeafName(leaf);
 // Do we care if a file provided by this process fails to load?
-if (Substring(leaf, leaf.Length() - 4).Equals(NS_LITERAL_CSTRING(".xpi")))
+if (Substring(leaf, leaf.Length() - 4).EqualsLiteral(".xpi"))
 ReadExtensionPrefs(path);
 else
 -      pref_LoadPrefsInDir(path, nullptr, 0);
 +      pref_LoadPrefsInDir(path, specialFiles, MOZ_ARRAY_LENGTH(specialFiles));
 }
 #ifdef MOZ_WIDGET_ANDROID
 #include "AndroidBridge.h"
 using namespace mozilla::widget::android;
 #endif
-@@ -2722,16 +2726,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2729,16 +2733,25 @@ nsDownload::SetState(DownloadState aStat
 nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
 // 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;
-@@ -2759,19 +2772,20 @@ nsDownload::SetState(DownloadState aStat
+@@ -2766,19 +2779,20 @@ nsDownload::SetState(DownloadState aStat
 // because if it is, they'll click open the download manager and
 // the items they downloaded will have been removed.
 alerts->ShowAlertNotification(
 NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,
 message, !removeWhenDone,
 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
-@@ -58,29 +58,33 @@ toolkit.jar:
+@@ -55,29 +55,33 @@ toolkit.jar:
 content/global/viewZoomOverlay.js          (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/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/popup.xml           (widgets/popup.xml)
 *+ content/global/bindings/preferences.xml     (widgets/preferences.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)
 +        <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
 +        <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
-+                pack="end">
++                >
 +	<xul:button dlgtype="help" class="dialog-button" hidden="true"/>
 +	<xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
 +	<xul:spacer anonid="spacer" flex="1" hidden="true"/>
 +	<xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/>
 +	<xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
 +</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,1333 @@
+@@ -0,0 +1,1343 @@
 +<?xml version="1.0"?>
 +
 +<!DOCTYPE bindings [
 +  <!ENTITY % preferencesDTD SYSTEM "chrome://global/locale/preferences.dtd">
 +  %preferencesDTD;
 +#   </prefwindow>
 +#
 +
 +  <binding id="preferences">
 +    <implementation implements="nsIObserver">
++      <method name="_constructAfterChildren">
++      <body>
++      <![CDATA[
++      // This method will be called after each one of the child
++      // <preference> elements is constructed. Its purpose is to propagate
++      // the values to the associated form elements
++
++      var elements = this.getElementsByTagName("preference");
++      for (let element of elements) {
++        if (!element._constructed) {
++          return;
++        }
++      }
++      for (let element of elements) {
++        element.updateElements();
++      }
++      ]]>
++      </body>
++      </method>
 +      <method name="observe">
 +        <parameter name="aSubject"/>
 +        <parameter name="aTopic"/>
 +        <parameter name="aData"/>
 +        <body>
 +
 +  <binding id="preference">
 +    <implementation>
 +      <constructor>
 +      <![CDATA[
++        this._constructed = true;
++
 +        // if the element has been inserted without the name attribute set,
 +        // we have nothing to do here
 +        if (!this.name)
 +          return;
 +
 +            for (var l = 0; (l < parentPrefs.length && !preference); ++l) {
 +              if (parentPrefs[l].localName == "preference")
 +                preference = parentPrefs[l];
 +            }
 +          }
-+          this._setValue(preference ? preference.value
++
-+                                    : this.valueFromPreferences, false);
++          // Don't use the value setter here, we don't want updateElements to be prematurely fired.
++          this._value = preference ? preference.value : this.valueFromPreferences;
 +        }
 +        else
-+          this._setValue(this.valueFromPreferences, false);
++          this._value = this.valueFromPreferences;
++        this.preferences._constructAfterChildren();
 +      ]]>
 +      </constructor>
 +      <destructor>
 +        this.preferences.rootBranchInternal
 +            .removeObserver(this.name, this.preferences);
 +      </destructor>
-+
++      <field name="_constructed">false</field>
 +      <property name="instantApply">
 +        <getter>
 +          return this.getAttribute("instantApply") == "true" || this.preferences.instantApply;
 +        </getter>
 +      </property>
 +                                onset="this.setAttribute('readonly', val); return val;"/>
 +
 +      <field name="_value">null</field>
 +      <method name="_setValue">
 +        <parameter name="aValue"/>
-+        <parameter name="aUpdate"/>
 +        <body>
 +        <![CDATA[
-+          if (aUpdate && this.value !== aValue) {
++          if (this.value !== aValue) {
 +            this._value = aValue;
 +            if (this.instantApply)
 +              this.valueFromPreferences = aValue;
 +            this.preferences.fireChangedEvent(this);
 +          }
-+          else if (!aUpdate) {
-+            this._value = aValue;
-+            this.updateElements();
-+          }
 +          return aValue;
 +        ]]>
 +        </body>
 +      </method>
-+      <property name="value" onget="return this._value" onset="return this._setValue(val, true);"/>
++      <property name="value" onget="return this._value" onset="return this._setValue(val);"/>
 +
 +      <property name="locked">
 +        <getter>
 +          return this.preferences.rootBranch.prefIsLocked(this.name);
 +        </getter>
 +        <xul:deck anonid="paneDeck" flex="1">
 +          <children includes="prefpane"/>
 +        </xul:deck>
 +      </xul:hbox>
 +      <xul:hbox anonid="dlg-buttons" class="prefWindow-dlgbuttons" pack="end">
-+#ifdef XP_UNIX_GNOME
++#ifndef XP_UNIX
 +        <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
 +        <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
 +        <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
 +        <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
 +        <xul:spacer anonid="spacer" flex="1"/>
 +        <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
 +        <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
-+#elif XP_UNIX
-+        <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
-+        <xul:spacer anonid="spacer" flex="1"/>
-+        <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
-+        <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
-+        <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
-+        <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
-+        <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
 +#else
 +        <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
 +        <xul:spacer anonid="spacer" flex="1"/>
 +        <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
 +        <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 endif
 diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
 --- a/uriloader/exthandler/moz.build
 +++ b/uriloader/exthandler/moz.build
-@@ -80,17 +80,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
+@@ -75,17 +75,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
 else:
 # These files can't be built in unified mode because they force NSPR logging.
 SOURCES += [
 osdir + '/nsOSHelperAppService.cpp',
 ]
 if (directive->regfunc) {
 if (GeckoProcessType_Default != XRE_GetProcessType())
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp
 +++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -43,16 +43,17 @@
+@@ -44,16 +44,17 @@
 #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"
-@@ -1816,46 +1817,52 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1962,53 +1963,55 @@ nsLocalFile::SetPersistentDescriptor(con
 return InitWithNativePath(aPersistentDescriptor);
 #endif
 }
 NS_IMETHODIMP
 nsLocalFile::Reveal()
 {
 #ifdef MOZ_WIDGET_GTK
--    nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
+-  nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
--    nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
+-  nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
--    if (!giovfs && !gnomevfs)
+-  if (!giovfs && !gnomevfs) {
--        return NS_ERROR_FAILURE;
+-    return NS_ERROR_FAILURE;
+-  }
 -
-+    nsAutoCString url;
++  nsAutoCString url;
 bool isDirectory;
-if (NS_FAILED(IsDirectory(&isDirectory)))
+if (NS_FAILED(IsDirectory(&isDirectory))) {
 return NS_ERROR_FAILURE;
+}
-+    nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-if (isDirectory) {
++  nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
--        if (giovfs)
+if (isDirectory) {
--            return giovfs->ShowURIForInput(mPath);
+-    if (giovfs) {
--        else
+-      return giovfs->ShowURIForInput(mPath);
--            /* Fallback to GnomeVFS */
+-    } else
--            return gnomevfs->ShowURIForInput(mPath);
+-      /* Fallback to GnomeVFS */
-+        url = mPath;
+-    {
-} else if (giovfs && NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) {
+-      return gnomevfs->ShowURIForInput(mPath);
-return NS_OK;
+-    }
-} else {
++    url = mPath;
-nsCOMPtr<nsIFile> parentDir;
+} else if (giovfs && NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) {
-nsAutoCString dirPath;
+return NS_OK;
-if (NS_FAILED(GetParent(getter_AddRefs(parentDir))))
+} else {
-return NS_ERROR_FAILURE;
+nsCOMPtr<nsIFile> parentDir;
-if (NS_FAILED(parentDir->GetNativePath(dirPath)))
+nsAutoCString dirPath;
-return NS_ERROR_FAILURE;
+if (NS_FAILED(GetParent(getter_AddRefs(parentDir)))) {
+return NS_ERROR_FAILURE;
--        if (giovfs)
--            return giovfs->ShowURIForInput(dirPath);
--        else
--            return gnomevfs->ShowURIForInput(dirPath);
-+        url = dirPath;
 }
-+
+if (NS_FAILED(parentDir->GetNativePath(dirPath))) {
-+    if(nsKDEUtils::kdeSupport()) {
+return NS_ERROR_FAILURE;
-+      nsTArray<nsCString> command;
+}
-+      command.AppendElement( NS_LITERAL_CSTRING("REVEAL") );
-+      command.AppendElement( mPath );
+-    if (giovfs) {
-+      return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
+-      return giovfs->ShowURIForInput(dirPath);
-+    }
+-    } else {
-+
+-      return gnomevfs->ShowURIForInput(dirPath);
-+    nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
+-    }
-+    if (!giovfs && !gnomevfs)
++    url = dirPath;
-+      return NS_ERROR_FAILURE;
+}
 +
-+    if (giovfs)
++  if(nsKDEUtils::kdeSupport()) {
-+      return giovfs->ShowURIForInput(url);
++    nsTArray<nsCString> command;
-+    else
++    command.AppendElement( NS_LITERAL_CSTRING("REVEAL") );
-+      return gnomevfs->ShowURIForInput(url);
++    command.AppendElement( mPath );
++    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
++  }
++
++  nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
++  if (!giovfs && !gnomevfs)
++    return NS_ERROR_FAILURE;
++
++  if (giovfs)
++    return giovfs->ShowURIForInput(url);
++  else
++    return gnomevfs->ShowURIForInput(url);
 #elif defined(MOZ_WIDGET_COCOA)
 CFURLRef url;
 if (NS_SUCCEEDED(GetCFURL(&url))) {
 nsresult rv = CocoaFileUtils::RevealFileInFinder(url);
 ::CFRelease(url);
 return rv;
 }
 return NS_ERROR_FAILURE;
-@@ -1863,16 +1870,23 @@ nsLocalFile::Reveal()
+@@ -2016,16 +2019,22 @@ nsLocalFile::Reveal()
 return NS_ERROR_FAILURE;
 #endif
 }
 NS_IMETHODIMP
 nsLocalFile::Launch()
 {
 #ifdef MOZ_WIDGET_GTK
-+    if( nsKDEUtils::kdeSupport()) {
++  if( nsKDEUtils::kdeSupport()) {
-+      nsTArray<nsCString> command;
++    nsTArray<nsCString> command;
-+      command.AppendElement( NS_LITERAL_CSTRING("OPEN") );
++    command.AppendElement( NS_LITERAL_CSTRING("OPEN") );
-+      command.AppendElement( mPath );
++    command.AppendElement( mPath );
-+      return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
++    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
-+    }
++  }
-+
+nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
+nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
-nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
+if (giovfs) {
-if (giovfs) {
+return giovfs->ShowURIForInput(mPath);
-return giovfs->ShowURIForInput(mPath);
+} else if (gnomevfs) {
-} else if (gnomevfs) {
+/* GnomeVFS fallback */
-/* GnomeVFS fallback */
+return gnomevfs->ShowURIForInput(mPath);
-return gnomevfs->ShowURIForInput(mPath);
+}
-}

changeset 748	72ba5129e5fd
parent 738	f118b88b7d7f
child 757	7913ca5779dc