diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in

--- a/modules/libpref/src/Makefile.in

+++ b/modules/libpref/src/Makefile.in

@@ -87,14 +87,16 @@ GREPREF_FILES = $(topsrcdir)/netwerk/bas

 # Optimizer bug with GCC 3.2.2 on OS/2

 ifeq ($(OS_ARCH), OS2)

 nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp

 	$(REPORT_BUILD)

 	@$(MAKE_DEPS_AUTO_CXX)

 	$(ELOG) $(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS:-O2=-O1) $(_VPATH_SRCS)

 endif

+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre

+

 greprefs.js: $(GREPREF_FILES)

 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PREF_PPFLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $^ > $@

 libs:: greprefs.js

 	$(INSTALL) $^ $(DIST)/bin/

diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp

--- a/modules/libpref/src/Preferences.cpp

+++ b/modules/libpref/src/Preferences.cpp

@@ -53,16 +53,17 @@

 #include "nsIStringEnumerator.h"

 #include "nsIZipReader.h"

 #include "nsPrefBranch.h"

 #include "nsXPIDLString.h"

 #include "nsCRT.h"

 #include "nsCOMArray.h"

 #include "nsXPCOMCID.h"

 #include "nsAutoPtr.h"

+#include "nsKDEUtils.h"

 #include "nsQuickSort.h"

 #include "prmem.h"

 #include "pldhash.h"

 #include "prefapi.h"

 #include "prefread.h"

 #include "prefapi_private_data.h"

@@ -822,30 +823,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char 

 }

 static nsresult pref_LoadPrefsInDirList(const char *listId)

 {

   nsresult rv;

   nsCOMPtr<nsIProperties> dirSvc(do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv));

   if (NS_FAILED(rv)) return rv;

+  // make sure we load these special files after all the others

+  static const char* specialFiles[] = {

+#if defined(XP_UNIX)

+    ""

+#endif

+  };

+

+  if (nsKDEUtils::kdeSession()) {

+    for(int i = 0;

+        i < NS_ARRAY_LENGTH(specialFiles);

+        ++i ) {

+      if (*specialFiles[ i ] == '\0') {

+        specialFiles[ i ] = "kde.js";

+        break;

+      }

+    }

+  }

+

   nsCOMPtr<nsISimpleEnumerator> dirList;

   dirSvc->Get(listId,

               NS_GET_IID(nsISimpleEnumerator),

               getter_AddRefs(dirList));

   if (dirList) {

     PRBool hasMore;

     while (NS_SUCCEEDED(dirList->HasMoreElements(&hasMore)) && hasMore) {

       nsCOMPtr<nsISupports> elem;

       dirList->GetNext(getter_AddRefs(elem));

       if (elem) {

         nsCOMPtr<nsIFile> dir = do_QueryInterface(elem);

         if (dir) {

           // Do we care if a file provided by this process fails to load?

-          pref_LoadPrefsInDir(dir, nsnull, 0); 

+          pref_LoadPrefsInDir(dir, specialFiles, NS_ARRAY_LENGTH(specialFiles));

         }

       }

     }

   }

   return NS_OK;

 }

 static nsresult pref_ReadPrefFromJar(nsZipArchive* jarReader, const char *name)

@@ -938,28 +957,40 @@ static nsresult pref_InitInitialObjects(

     /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */

     static const char* specialFiles[] = {

 #if defined(XP_MACOSX)

       "macprefs.js"

 #elif defined(XP_WIN)

       "winpref.js"

 #elif defined(XP_UNIX)

       "unix.js"

+      , "" // placeholder for KDE  (empty is otherwise harmless)

 #if defined(VMS)

       , "openvms.js"

 #elif defined(_AIX)

       , "aix.js"

 #endif

 #elif defined(XP_OS2)

       "os2pref.js"

 #elif defined(XP_BEOS)

       "beos.js"

 #endif

     };

+    if(nsKDEUtils::kdeSession()) { // TODO what if some setup actually requires the helper?

+      for( int i = 0;

+          i < NS_ARRAY_LENGTH(specialFiles);

+          ++i ) {

+        if( *specialFiles[ i ] == '\0' ) {

+          specialFiles[ i ] = "kde.js";

+          break;

+        }

+      }

+    }

+

     rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles));

     if (NS_FAILED(rv))

       NS_WARNING("Error parsing application default preferences.");

   }

   // Load jar:$app/omni.jar!/defaults/preferences/*.js

   nsZipArchive *appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP);

   if (appJarReader) {

diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in

--- a/toolkit/components/downloads/Makefile.in

+++ b/toolkit/components/downloads/Makefile.in

@@ -79,8 +79,10 @@ endif

 ifdef ENABLE_TESTS

 DIRS += test

 endif

 include $(topsrcdir)/config/rules.mk

 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)

+

+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre

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

@@ -71,16 +71,20 @@

 #ifdef XP_WIN

 #include <shlobj.h>

 #ifdef DOWNLOAD_SCANNER

 #include "nsDownloadScanner.h"

 #endif

 #endif

+#if defined(XP_UNIX) && !defined(XP_MACOSX)

+#include "nsKDEUtils.h"

+#endif

+

 #ifdef XP_MACOSX

 #include <CoreFoundation/CoreFoundation.h>

 #endif

 #ifdef ANDROID

 #include "AndroidBridge.h"

 #endif

@@ -2192,16 +2196,25 @@ nsDownload::SetState(DownloadState aStat

       nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));

       // Master pref to control this function.

       PRBool showTaskbarAlert = PR_TRUE;

       if (pref)

         pref->GetBoolPref(PREF_BDM_SHOWALERTONCOMPLETE, &showTaskbarAlert);

       if (showTaskbarAlert) {

+        if( nsKDEUtils::kdeSupport()) {

+            nsCStringArray command;

+            command.AppendCString( NS_LITERAL_CSTRING( "DOWNLOADFINISHED" ));

+            nsAutoString displayName;

+            GetDisplayName( displayName );

+            command.AppendCString( nsCAutoString( ToNewUTF8String( displayName )));

+            nsKDEUtils::command( command );

+        } else {

+        // begin non-KDE block

         PRInt32 alertInterval = 2000;

         if (pref)

           pref->GetIntPref(PREF_BDM_SHOWALERTINTERVAL, &alertInterval);

         PRInt64 alertIntervalUSec = alertInterval * PR_USEC_PER_MSEC;

         PRInt64 goat = PR_Now() - mStartTime;

         showTaskbarAlert = goat > alertIntervalUSec;

@@ -2225,19 +2238,20 @@ nsDownload::SetState(DownloadState aStat

               // If downloads are automatically removed per the user's

               // retention policy, there's no reason to make the text clickable

               // 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, EmptyString(), mDownloadManager,

                   EmptyString());

-            }

+          }

         }

       }

+      }

 #if defined(XP_WIN) || defined(XP_MACOSX) || defined(ANDROID)

       nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget);

       nsCOMPtr<nsIFile> file;

       nsAutoString path;

       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

@@ -40,29 +40,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/colorpicker.xml     (widgets/colorpicker.xml)

 *+ content/global/bindings/datetimepicker.xml  (widgets/datetimepicker.xml)

 *+ content/global/bindings/dialog.xml          (widgets/dialog.xml)

+*+ content/global/bindings/dialog-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/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/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-kde.xml (widgets/preferences-kde.xml)

+% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde

 *+ content/global/bindings/progressmeter.xml   (widgets/progressmeter.xml)

 *+ content/global/bindings/radio.xml           (widgets/radio.xml)

 *+ content/global/bindings/resizer.xml         (widgets/resizer.xml)

 *+ content/global/bindings/richlistbox.xml     (widgets/richlistbox.xml)

 *+ content/global/bindings/scale.xml           (widgets/scale.xml)

 *+ content/global/bindings/scrollbar.xml       (widgets/scrollbar.xml)

 *+ content/global/bindings/scrollbox.xml       (widgets/scrollbox.xml)

 *+ content/global/bindings/splitter.xml        (widgets/splitter.xml)

diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml

new file mode 100644

--- /dev/null

+++ b/toolkit/content/widgets/dialog-kde.xml

@@ -0,0 +1,447 @@

+<?xml version="1.0"?>

+

+<bindings id="dialogBindings"

+          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"/>

+    </resources>

+    <content>

+      <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

+                >

+        <xul:button dlgtype="disclosure" 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="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"/>

+	<xul:button dlgtype="cancel" class="dialog-button"/>

+	<xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>

+#else

+                pack="end">

+        <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"/>

+        <xul:button dlgtype="cancel" class="dialog-button"/>

+        <xul:button dlgtype="help" class="dialog-button" hidden="true"/>

+        <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>

+#endif

+      </xul:hbox>

+    </content>

+

+    <implementation>

+      <field name="_mStrBundle">null</field>

+      <field name="_closeHandler">(function(event) {

+        if (!document.documentElement.cancelDialog())

+          event.preventDefault();

+      })</field>

+

+      <property name="buttons"

+                onget="return this.getAttribute('buttons');"

+                onset="this._configureButtons(val); return val;"/>

+

+      <property name="defaultButton">

+        <getter>

+        <![CDATA[

+          if (this.hasAttribute("defaultButton"))

+            return this.getAttribute("defaultButton");

+          else // default to the accept button

+            return "accept";

+        ]]>

+        </getter>

+        <setter>

+        <![CDATA[

+          this._setDefaultButton(val);

+          return val;

+        ]]>

+        </setter>

+      </property>

+

+      <method name="acceptDialog">

+        <body>

+        <![CDATA[

+          return this._doButtonCommand("accept");

+        ]]>

+        </body>

+      </method>

+      

+      <method name="cancelDialog">

+        <body>

+        <![CDATA[

+          return this._doButtonCommand("cancel");

+        ]]>

+        </body>

+      </method>

+      

+      <method name="getButton">

+        <parameter name="aDlgType"/>

+        <body>

+        <![CDATA[

+          return this._buttons[aDlgType];

+        ]]>

+        </body>

+      </method>

+

+      <method name="moveToAlertPosition">

+        <body>

+        <![CDATA[

+          // hack. we need this so the window has something like its final size

+          if (window.outerWidth == 1) {

+            dump("Trying to position a sizeless window; caller should have called sizeToContent() or sizeTo(). See bug 75649.\n");

+            sizeToContent();

+          }

+

+          var xOffset = (opener.outerWidth - window.outerWidth) / 2;

+          var yOffset = opener.outerHeight / 5;

+

+          var newX = opener.screenX + xOffset;

+          var newY = opener.screenY + yOffset;

+

+          // ensure the window is fully onscreen (if smaller than the screen)

+          if (newX < screen.availLeft)

+            newX = screen.availLeft + 20;

+          if ((newX + window.outerWidth) > (screen.availLeft + screen.availWidth))

+            newX = (screen.availLeft + screen.availWidth) - window.outerWidth - 20;

+

+          if (newY < screen.availTop)

+            newY = screen.availTop + 20;

+          if ((newY + window.outerHeight) > (screen.availTop + screen.availHeight))

+            newY = (screen.availTop + screen.availHeight) - window.outerHeight - 60;

+

+          window.moveTo( newX, newY );

+        ]]>

+        </body>

+      </method>

+

+      <method name="centerWindowOnScreen">

+        <body>

+        <![CDATA[

+          var xOffset = screen.availWidth/2 - window.outerWidth/2;

+          var yOffset = screen.availHeight/2 - window.outerHeight/2; //(opener.outerHeight *2)/10;

+  

+          xOffset = xOffset > 0 ? xOffset : 0;

+          yOffset = yOffset > 0 ? yOffset : 0;

+          window.moveTo(xOffset, yOffset);

+        ]]>

+        </body>

+      </method>

+

+      <constructor>

+      <![CDATA[

+        this._configureButtons(this.buttons);

+

+        // listen for when window is closed via native close buttons

+        window.addEventListener("close", this._closeHandler, false);

+

+        // for things that we need to initialize after onload fires

+        window.addEventListener("load", this.postLoadInit, false);

+

+        window.moveToAlertPosition = this.moveToAlertPosition;

+        window.centerWindowOnScreen = this.centerWindowOnScreen;

+      ]]>

+      </constructor>

+

+      <method name="postLoadInit">

+        <parameter name="aEvent"/>

+        <body>

+        <![CDATA[

+          function focusInit() {

+            const dialog = document.documentElement;

+            const defaultButton = dialog.getButton(dialog.defaultButton);

+            // give focus to the first focusable element in the dialog

+            if (!document.commandDispatcher.focusedElement) {

+              document.commandDispatcher.advanceFocusIntoSubtree(dialog);

+

+              var focusedElt = document.commandDispatcher.focusedElement;

+              if (focusedElt) {

+                var initialFocusedElt = focusedElt;

+                while (focusedElt.localName == "tab" ||

+                       focusedElt.getAttribute("noinitialfocus") == "true") {

+                  document.commandDispatcher.advanceFocusIntoSubtree(focusedElt);

+                  focusedElt = document.commandDispatcher.focusedElement;

+                  if (focusedElt == initialFocusedElt)

+                    break;

+                }

+

+                if (initialFocusedElt.localName == "tab") {

+                  if (focusedElt.hasAttribute("dlgtype")) {

+                    // We don't want to focus on anonymous OK, Cancel, etc. buttons,

+                    // so return focus to the tab itself

+                    initialFocusedElt.focus();

+                  }

+                }

+#ifndef XP_MACOSX

+                else if (focusedElt.hasAttribute("dlgtype") && focusedElt != defaultButton) {

+                  defaultButton.focus();

+                }

+#endif

+              }

+            }

+

+            try {

+              if (defaultButton)

+                window.notifyDefaultButtonLoaded(defaultButton);

+            } catch (e) { }

+          }

+

+          // Give focus after onload completes, see bug 103197.

+          setTimeout(focusInit, 0);

+        ]]>

+        </body>

+      </method>                

+

+      <property name="mStrBundle">

+        <getter>

+        <![CDATA[

+          if (!this._mStrBundle) {

+            // need to create string bundle manually instead of using <xul:stringbundle/>

+            // see bug 63370 for details

+            this._mStrBundle = Components.classes["@mozilla.org/intl/stringbundle;1"]

+                                         .getService(Components.interfaces.nsIStringBundleService)

+                                         .createBundle("chrome://global/locale/dialog.properties");

+          }

+          return this._mStrBundle;

+        ]]></getter>

+      </property>

+      

+      <method name="_configureButtons">

+        <parameter name="aButtons"/>

+        <body>

+        <![CDATA[

+          // by default, get all the anonymous button elements

+          var buttons = {};

+          this._buttons = buttons;

+          buttons.accept = document.getAnonymousElementByAttribute(this, "dlgtype", "accept");

+          buttons.cancel = document.getAnonymousElementByAttribute(this, "dlgtype", "cancel");

+          buttons.extra1 = document.getAnonymousElementByAttribute(this, "dlgtype", "extra1");

+          buttons.extra2 = document.getAnonymousElementByAttribute(this, "dlgtype", "extra2");

+          buttons.help = document.getAnonymousElementByAttribute(this, "dlgtype", "help");

+          buttons.disclosure = document.getAnonymousElementByAttribute(this, "dlgtype", "disclosure");

+

+          // look for any overriding explicit button elements

+          var exBtns = this.getElementsByAttribute("dlgtype", "*");

+          var dlgtype;

+          var i;

+          for (i = 0; i < exBtns.length; ++i) {

+            dlgtype = exBtns[i].getAttribute("dlgtype");

+            buttons[dlgtype].hidden = true; // hide the anonymous button

+            buttons[dlgtype] = exBtns[i];

+          }

+

+          // add the label and oncommand handler to each button

+          for (dlgtype in buttons) {

+            var button = buttons[dlgtype];

+            button.addEventListener("command", this._handleButtonCommand, true);

+