From 23f74fadd0f3c58014c3284001fb0709ed0bd53a Mon Sep 17 00:00:00 2001
From: Tigro <ashejn@gmail.com>
Date: Tue, 2 Sep 2014 12:36:58 +0400
Subject: [PATCH] update to 32.0

---
 .abf.yml                                     |   2 +-
 firefox-31-kde.patch => firefox-32-kde.patch |  43 ++--
 firefox.spec                                 |   6 +-
 mozilla-31-kde.patch => mozilla-32-kde.patch | 212 ++++++++++---------
 4 files changed, 144 insertions(+), 119 deletions(-)
 rename firefox-31-kde.patch => firefox-32-kde.patch (98%)
 rename mozilla-31-kde.patch => mozilla-32-kde.patch (96%)

diff --git a/.abf.yml b/.abf.yml
index 7de2f11..5b1eaf5 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,3 @@
 sources:
   firefox-searchengines-bing.xml: ccdb7c0cc2d288714f70f8a92f0adfc2766f2b36
-  firefox-31.0.source.tar.bz2: a6c3e25ee3aeb7da42db2aaeb50a385d63532beb
+  firefox-32.0.source.tar.bz2: 5cb7644af9741ebcdb3a21b777362913908c8f41
diff --git a/firefox-31-kde.patch b/firefox-32-kde.patch
similarity index 98%
rename from firefox-31-kde.patch
rename to firefox-32-kde.patch
index 3fb27ed..30ce3e5 100644
--- a/firefox-31-kde.patch
+++ b/firefox-32-kde.patch
@@ -2,7 +2,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1197 @@
+@@ -0,0 +1,1206 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -106,6 +106,12 @@ new file mode 100644
 +                accesskey="&moveToNewWindow.accesskey;"
 +                tbattr="tabbrowser-multiple"
 +                oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/>
++#ifdef E10S_TESTING_ONLY
++      <menuitem id="context_openNonRemoteWindow" label="Open in new non-e10s window"
++                tbattr="tabbrowser-remote"
++                hidden="true"
++                oncommand="gBrowser.openNonRemoteWindow(TabContextMenu.contextTab);"/>
++#endif
 +      <menuseparator/>
 +      <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;"
 +                tbattr="tabbrowser-multiple-visible"
@@ -245,7 +251,7 @@ new file mode 100644
 +           onpopuphidden="SocialShare.onHidden()"
 +           hidden="true">
 +      <vbox class="social-share-toolbar">
-+        <vbox id="social-share-provider-buttons" flex="1"/>
++        <arrowscrollbox id="social-share-provider-buttons" orient="vertical" flex="1"/>
 +      </vbox>
 +    </panel>
 +
@@ -311,7 +317,7 @@ new file mode 100644
 +                oncommand="BrowserFullScreen();"/>
 +    </menupopup>
 +
-+    <menupopup id="contentAreaContextMenu" pagemenu="start"
++    <menupopup id="contentAreaContextMenu" pagemenu="#page-menu-separator"
 +               onpopupshowing="if (event.target != this)
 +                                 return true;
 +                               gContextMenu = new nsContextMenu(this, event.shiftKey);
@@ -578,7 +584,7 @@ new file mode 100644
 +                     label="&tabCmd.label;"
 +                     command="cmd_newNavigatorTab"
 +                     onclick="checkForMiddleClick(this, event);"
-+                     tooltiptext="&newTabButton.tooltip;"
++                     tooltip="dynamic-shortcut-tooltip"
 +                     ondrop="newTabButtonObserver.onDrop(event)"
 +                     ondragover="newTabButtonObserver.onDragOver(event)"
 +                     ondragenter="newTabButtonObserver.onDragOver(event)"
@@ -874,6 +880,7 @@ new file mode 100644
 +             during the customization of the toolbar, in the palette, and before
 +             the Downloads Indicator overlay is loaded. -->
 +        <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
++                       key="key_openDownloads"
 +                       oncommand="DownloadsIndicatorView.onCommand(event);"
 +                       ondrop="DownloadsIndicatorView.onDrop(event);"
 +                       ondragover="DownloadsIndicatorView.onDragOver(event);"
@@ -881,7 +888,7 @@ new file mode 100644
 +                       label="&downloads.label;"
 +                       removable="true"
 +                       cui-areatype="toolbar"
-+                       tooltiptext="&downloads.tooltip;"/>
++                       tooltip="dynamic-shortcut-tooltip"/>
 +
 +        <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
 +                       persist="class" removable="true"
@@ -890,6 +897,7 @@ new file mode 100644
 +                       ondragenter="homeButtonObserver.onDragOver(event)"
 +                       ondrop="homeButtonObserver.onDrop(event)"
 +                       ondragexit="homeButtonObserver.onDragExit(event)"
++                       key="goHome"
 +                       onclick="BrowserGoHome(event);"
 +                       cui-areatype="toolbar"
 +                       aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
@@ -897,11 +905,11 @@ new file mode 100644
 +
 +        <toolbarbutton id="social-share-button"
 +                       class="toolbarbutton-1 chromeclass-toolbar-additional"
-+                       hidden="true"
-+                       overflows="false"
 +                       label="&sharePageCmd.label;"
 +                       tooltiptext="&sharePageCmd.label;"
 +                       cui-areatype="toolbar"
++                       removable="true"
++                       hidden="true"
 +                       command="Social:SharePage"/>
 +      </hbox>
 +
@@ -1011,9 +1019,11 @@ new file mode 100644
 +
 +      <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
 +#ifdef XP_MACOSX
-+                     command="cmd_print" tooltip="dynamic-shortcut-tooltip"
++                     command="cmd_print"
++                     tooltip="dynamic-shortcut-tooltip"
 +#else
-+                     command="cmd_printPreview" tooltiptext="&printButton.tooltip;"
++                     command="cmd_printPreview"
++                     tooltiptext="&printButton.tooltip;"
 +#endif
 +                     label="&printButton.label;"/>
 +
@@ -1070,8 +1080,7 @@ new file mode 100644
 +                    tabcontainer="tabbrowser-tabs"
 +                    contentcontextmenu="contentAreaContextMenu"
 +                    autocompletepopup="PopupAutoComplete"
-+                    selectpopup="ContentSelectDropdown"
-+                    onclick="contentAreaClick(event, false);"/>
++                    selectpopup="ContentSelectDropdown"/>
 +        <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/>
 +      </vbox>
 +      <splitter id="social-sidebar-splitter"
@@ -1203,7 +1212,7 @@ new file mode 100644
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn
-@@ -65,16 +65,18 @@ browser.jar:
+@@ -70,16 +70,18 @@ browser.jar:
          content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
          content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
          content/browser/aboutSocialError.xhtml        (content/aboutSocialError.xhtml)
@@ -1217,11 +1226,11 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn
  *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
  *       content/browser/chatWindow.xul                (content/chatWindow.xul)
          content/browser/content.js                    (content/content.js)
-         content/browser/fonts/ClearSans-Regular.woff  (content/fonts/ClearSans-Regular.woff)
-         content/browser/fonts/FiraSans-Regular.woff   (content/fonts/FiraSans-Regular.woff)
-         content/browser/fonts/FiraSans-Light.woff     (content/fonts/FiraSans-Light.woff)
          content/browser/newtab/newTab.xul             (content/newtab/newTab.xul)
  *       content/browser/newtab/newTab.js              (content/newtab/newTab.js)
+         content/browser/newtab/newTab.css             (content/newtab/newTab.css)
+ *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
+         content/browser/pageinfo/pageInfo.js          (content/pageinfo/pageInfo.js)
 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
 --- a/browser/components/build/nsModule.cpp
 +++ b/browser/components/build/nsModule.cpp
@@ -1308,7 +1317,7 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/pre
      // when the user will select the default.  We refresh here periodically
      // in case the default changes.  On other Windows OS's defaults can also
      // be set while the prefs are open.
-@@ -884,14 +890,25 @@ var gAdvancedPane = {
+@@ -875,14 +881,25 @@ var gAdvancedPane = {
     * Set browser as the operating system default browser.
     */
    setDefaultBrowser: function()
@@ -1790,7 +1799,7 @@ new file mode 100644
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -643,19 +643,21 @@
+@@ -666,19 +666,21 @@
  @BINPATH@/defaults/autoconfig/prefcalls.js
  @BINPATH@/browser/defaults/profile/prefs.js
  
diff --git a/firefox.spec b/firefox.spec
index d237473..8dd1a57 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -7,7 +7,7 @@
 # This also means only STABLE upstream releases, NO betas.
 # This is a discussed topic. Please, do not flame it again.
 
-%define major 31.0
+%define major 32.0
 %define ff_epoch 0
 # (tpg) set version HERE !!!
 %define realver %{major}
@@ -52,8 +52,8 @@ Patch2:         firefox-vendor.patch
 Patch8:		firefox-25.0-disable-check-default-browser.patch
 Patch10:	firefox-3.5.3-default-mail-handler.patch
 # Patches for kde integration of FF 
-Patch11:	firefox-31-kde.patch
-Patch12:	mozilla-31-kde.patch
+Patch11:	firefox-32-kde.patch
+Patch12:	mozilla-32-kde.patch
 Patch13:	mozilla-kde-background.patch
 Patch34:	xulrunner_nojit.patch
 
diff --git a/mozilla-31-kde.patch b/mozilla-32-kde.patch
similarity index 96%
rename from mozilla-31-kde.patch
rename to mozilla-32-kde.patch
index 9183d3a..6765422 100644
--- a/mozilla-31-kde.patch
+++ b/mozilla-32-kde.patch
@@ -85,7 +85,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
      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);
@@ -217,7 +217,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
  #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.
@@ -243,7 +243,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
          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(
@@ -268,7 +268,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
 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)
@@ -290,7 +290,7 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
     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
@@ -760,7 +760,7 @@ diff --git a/toolkit/content/widgets/preferences-kde.xml b/toolkit/content/widge
 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 [
@@ -793,6 +793,25 @@ new file mode 100644
 +
 +  <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"/>
@@ -864,6 +883,8 @@ new file mode 100644
 +    <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)
@@ -889,18 +910,20 @@ new file mode 100644
 +                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;
@@ -932,24 +955,19 @@ new file mode 100644
 +      <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>
@@ -1336,7 +1354,7 @@ new file mode 100644
 +        </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"/>
@@ -1344,14 +1362,6 @@ new file mode 100644
 +        <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"/>
@@ -2626,7 +2636,7 @@ diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
 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 += [
@@ -3584,7 +3594,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
 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"
@@ -3602,8 +3612,8 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
  #include "prmem.h"
  #include "plbase64.h"
  
-@@ -1816,46 +1817,52 @@ nsLocalFile::SetPersistentDescriptor(con
-     return InitWithNativePath(aPersistentDescriptor);
+@@ -1962,53 +1963,55 @@ nsLocalFile::SetPersistentDescriptor(con
+   return InitWithNativePath(aPersistentDescriptor);
  #endif
  }
  
@@ -3611,66 +3621,73 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
  nsLocalFile::Reveal()
  {
  #ifdef MOZ_WIDGET_GTK
--    nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
--    nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
--    if (!giovfs && !gnomevfs)
--        return NS_ERROR_FAILURE;
+-  nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
+-  nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
+-  if (!giovfs && !gnomevfs) {
+-    return NS_ERROR_FAILURE;
+-  }
 -
-+    nsAutoCString url;
-     bool isDirectory;
-     if (NS_FAILED(IsDirectory(&isDirectory)))
-         return NS_ERROR_FAILURE;
++  nsAutoCString url;
+   bool isDirectory;
+   if (NS_FAILED(IsDirectory(&isDirectory))) {
+     return NS_ERROR_FAILURE;
+   }
  
-+    nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-     if (isDirectory) {
--        if (giovfs)
--            return giovfs->ShowURIForInput(mPath);
--        else 
--            /* Fallback to GnomeVFS */
--            return gnomevfs->ShowURIForInput(mPath);
-+        url = mPath;
-     } else if (giovfs && NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) {
-         return NS_OK;
-     } else {
-         nsCOMPtr<nsIFile> parentDir;
-         nsAutoCString dirPath;
-         if (NS_FAILED(GetParent(getter_AddRefs(parentDir))))
-             return NS_ERROR_FAILURE;
-         if (NS_FAILED(parentDir->GetNativePath(dirPath)))
-             return NS_ERROR_FAILURE;
- 
--        if (giovfs)
--            return giovfs->ShowURIForInput(dirPath);
--        else 
--            return gnomevfs->ShowURIForInput(dirPath);        
-+        url = dirPath;
++  nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
+   if (isDirectory) {
+-    if (giovfs) {
+-      return giovfs->ShowURIForInput(mPath);
+-    } else
+-      /* Fallback to GnomeVFS */
+-    {
+-      return gnomevfs->ShowURIForInput(mPath);
+-    }
++    url = mPath;
+   } else if (giovfs && NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) {
+     return NS_OK;
+   } else {
+     nsCOMPtr<nsIFile> parentDir;
+     nsAutoCString dirPath;
+     if (NS_FAILED(GetParent(getter_AddRefs(parentDir)))) {
+       return NS_ERROR_FAILURE;
      }
+     if (NS_FAILED(parentDir->GetNativePath(dirPath))) {
+       return NS_ERROR_FAILURE;
+     }
+ 
+-    if (giovfs) {
+-      return giovfs->ShowURIForInput(dirPath);
+-    } else {
+-      return gnomevfs->ShowURIForInput(dirPath);
+-    }
++    url = dirPath;
+   }
 +
-+    if(nsKDEUtils::kdeSupport()) {
-+      nsTArray<nsCString> command;
-+      command.AppendElement( NS_LITERAL_CSTRING("REVEAL") );
-+      command.AppendElement( mPath );
-+      return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
-+    }
++  if(nsKDEUtils::kdeSupport()) {
++    nsTArray<nsCString> command;
++    command.AppendElement( NS_LITERAL_CSTRING("REVEAL") );
++    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;
++  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);
++  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()
-     return NS_ERROR_FAILURE;
+   CFURLRef url;
+   if (NS_SUCCEEDED(GetCFURL(&url))) {
+     nsresult rv = CocoaFileUtils::RevealFileInFinder(url);
+     ::CFRelease(url);
+     return rv;
+   }
+   return NS_ERROR_FAILURE;
+@@ -2016,16 +2019,22 @@ nsLocalFile::Reveal()
+   return NS_ERROR_FAILURE;
  #endif
  }
  
@@ -3678,18 +3695,17 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
  nsLocalFile::Launch()
  {
  #ifdef MOZ_WIDGET_GTK
-+    if( nsKDEUtils::kdeSupport()) {
-+      nsTArray<nsCString> command;
-+      command.AppendElement( NS_LITERAL_CSTRING("OPEN") );
-+      command.AppendElement( mPath );
-+      return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
-+    }
-+
-     nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
-     nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
-     if (giovfs) {
-       return giovfs->ShowURIForInput(mPath);
-     } else if (gnomevfs) {
-       /* GnomeVFS fallback */
-       return gnomevfs->ShowURIForInput(mPath);
-     }
++  if( nsKDEUtils::kdeSupport()) {
++    nsTArray<nsCString> command;
++    command.AppendElement( NS_LITERAL_CSTRING("OPEN") );
++    command.AppendElement( mPath );
++    return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
++  }
+   nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
+   nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
+   if (giovfs) {
+     return giovfs->ShowURIForInput(mPath);
+   } else if (gnomevfs) {
+     /* GnomeVFS fallback */
+     return gnomevfs->ShowURIForInput(mPath);
+   }