--- mozilla/chrome/src/Makefile.in.sav	2009-09-14 10:00:21.000000000 +0200

+++ mozilla/chrome/src/Makefile.in	2009-09-14 10:04:14.000000000 +0200

@@ -86,6 +86,7 @@ EXTRA_DSO_LDOPTS = \

 ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))

 EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)

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

 endif

 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))

--- mozilla/chrome/src/nsChromeRegistry.cpp.sav	2009-09-14 10:00:21.000000000 +0200

+++ mozilla/chrome/src/nsChromeRegistry.cpp	2009-09-14 10:04:14.000000000 +0200

@@ -114,6 +114,7 @@

 #include "nsIXULAppInfo.h"

 #include "nsIXULRuntime.h"

 #include "nsPresShellIterator.h"

+#include "nsKDEUtils.h"

 #ifdef MOZ_XUL

 // keep all the RDF stuff together, in case we can remove it in the far future

@@ -2208,6 +2209,7 @@ nsChromeRegistry::ProcessManifestBuffer(

   NS_NAMED_LITERAL_STRING(kAppVersion, "appversion");

   NS_NAMED_LITERAL_STRING(kOs, "os");

   NS_NAMED_LITERAL_STRING(kOsVersion, "osversion");

+  NS_NAMED_LITERAL_STRING(kDesktop, "desktop");

   nsCOMPtr<nsIIOService> io (do_GetIOService());

   if (!io) return NS_ERROR_FAILURE;

@@ -2251,6 +2253,7 @@ nsChromeRegistry::ProcessManifestBuffer(

   }

   nsAutoString osVersion;

+  nsAutoString desktop;

 #if defined(XP_WIN)

   OSVERSIONINFO info = { sizeof(OSVERSIONINFO) };

   if (GetVersionEx(&info)) {

@@ -2258,6 +2261,7 @@ nsChromeRegistry::ProcessManifestBuffer(

                                          info.dwMajorVersion,

                                          info.dwMinorVersion);

   }

+  desktop = NS_LITERAL_STRING("win");

 #elif defined(XP_MACOSX)

   long majorVersion, minorVersion;

   if ((Gestalt(gestaltSystemVersionMajor, &majorVersion) == noErr) &&

@@ -2266,10 +2270,12 @@ nsChromeRegistry::ProcessManifestBuffer(

                                          majorVersion,

                                          minorVersion);

   }

+  desktop = NS_LITERAL_STRING("macosx");

 #elif defined(MOZ_WIDGET_GTK2)

   nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(),

                                        gtk_major_version,

                                        gtk_minor_version);

+  desktop = nsKDEUtils::kdeSession() ? NS_LITERAL_STRING("kde") : NS_LITERAL_STRING("gnome"); // TODO others?

 #endif

   char *token;

@@ -2313,6 +2319,7 @@ nsChromeRegistry::ProcessManifestBuffer(

       TriState stApp = eUnspecified;

       TriState stOsVersion = eUnspecified;

       TriState stOs = eUnspecified;

+      TriState stDesktop = eUnspecified;

       PRBool badFlag = PR_FALSE;

@@ -2326,6 +2333,7 @@ nsChromeRegistry::ProcessManifestBuffer(

             CheckFlag(kContentAccessible, wtoken, contentAccessible) ||

             CheckStringFlag(kApplication, wtoken, appID, stApp) ||

             CheckStringFlag(kOs, wtoken, osTarget, stOs) ||

+            CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) ||

             CheckVersionFlag(kOsVersion, wtoken, osVersion, vc, stOsVersion) ||

             CheckVersionFlag(kAppVersion, wtoken, appVersion, vc, stAppVersion))

           continue;

@@ -2337,7 +2345,7 @@ nsChromeRegistry::ProcessManifestBuffer(

       }

       if (badFlag || stApp == eBad || stAppVersion == eBad || 

-          stOs == eBad || stOsVersion == eBad)

+          stOs == eBad || stOsVersion == eBad || stDesktop == eBad)

         continue;

       nsCOMPtr<nsIURI> resolved;

@@ -2398,6 +2406,7 @@ nsChromeRegistry::ProcessManifestBuffer(

       TriState stApp = eUnspecified;

       TriState stOs = eUnspecified;

       TriState stOsVersion = eUnspecified;

+      TriState stDesktop = eUnspecified;

       PRBool badFlag = PR_FALSE;

@@ -2408,6 +2417,7 @@ nsChromeRegistry::ProcessManifestBuffer(

         if (CheckStringFlag(kApplication, wtoken, appID, stApp) ||

             CheckStringFlag(kOs, wtoken, osTarget, stOs) ||

+            CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) ||

             CheckVersionFlag(kOsVersion, wtoken, osVersion, vc, stOsVersion) ||

             CheckVersionFlag(kAppVersion, wtoken, appVersion, vc, stAppVersion))

           continue;

@@ -2419,7 +2429,7 @@ nsChromeRegistry::ProcessManifestBuffer(

       }

       if (badFlag || stApp == eBad || stAppVersion == eBad ||

-          stOs == eBad || stOsVersion == eBad)

+          stOs == eBad || stOsVersion == eBad || stDesktop == eBad)

         continue;

       nsCOMPtr<nsIURI> resolved;

@@ -2460,6 +2470,7 @@ nsChromeRegistry::ProcessManifestBuffer(

       TriState stApp = eUnspecified;

       TriState stOs = eUnspecified;

       TriState stOsVersion = eUnspecified;

+      TriState stDesktop = eUnspecified;

       PRBool badFlag = PR_FALSE;

@@ -2470,6 +2481,7 @@ nsChromeRegistry::ProcessManifestBuffer(

         if (CheckStringFlag(kApplication, wtoken, appID, stApp) ||

             CheckStringFlag(kOs, wtoken, osTarget, stOs) ||

+            CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) ||

             CheckVersionFlag(kOsVersion, wtoken, osVersion, vc, stOsVersion) ||

             CheckVersionFlag(kAppVersion, wtoken, appVersion, vc, stAppVersion))

           continue;

@@ -2481,7 +2493,7 @@ nsChromeRegistry::ProcessManifestBuffer(

       }

       if (badFlag || stApp == eBad || stAppVersion == eBad ||

-          stOs == eBad || stOsVersion == eBad)

+          stOs == eBad || stOsVersion == eBad || stDesktop == eBad)

         continue;

       nsCOMPtr<nsIURI> resolved;

@@ -2524,6 +2536,7 @@ nsChromeRegistry::ProcessManifestBuffer(

       TriState stApp = eUnspecified;

       TriState stOs = eUnspecified;

       TriState stOsVersion = eUnspecified;

+      TriState stDesktop = eUnspecified;

       PRBool badFlag = PR_FALSE;

@@ -2534,6 +2547,7 @@ nsChromeRegistry::ProcessManifestBuffer(

         if (CheckStringFlag(kApplication, wtoken, appID, stApp) ||

             CheckStringFlag(kOs, wtoken, osTarget, stOs) ||

+            CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) ||

             CheckVersionFlag(kOsVersion, wtoken, osVersion, vc, stOsVersion) ||

             CheckVersionFlag(kAppVersion, wtoken, appVersion, vc, stAppVersion))

           continue;

@@ -2545,7 +2559,7 @@ nsChromeRegistry::ProcessManifestBuffer(

       }

       if (badFlag || stApp == eBad || stAppVersion == eBad ||

-          stOs == eBad || stOsVersion == eBad)

+          stOs == eBad || stOsVersion == eBad || stDesktop == eBad)

         continue;

       nsCOMPtr<nsIURI> baseuri, overlayuri;

@@ -2580,6 +2594,7 @@ nsChromeRegistry::ProcessManifestBuffer(

       TriState stApp = eUnspecified;

       TriState stOs = eUnspecified;

       TriState stOsVersion = eUnspecified;

+      TriState stDesktop = eUnspecified;

       PRBool badFlag = PR_FALSE;

@@ -2590,6 +2605,7 @@ nsChromeRegistry::ProcessManifestBuffer(

         if (CheckStringFlag(kApplication, wtoken, appID, stApp) ||

             CheckStringFlag(kOs, wtoken, osTarget, stOs) ||

+            CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) ||

             CheckVersionFlag(kOsVersion, wtoken, osVersion, vc, stOsVersion) ||

             CheckVersionFlag(kAppVersion, wtoken, appVersion, vc, stAppVersion))

           continue;

@@ -2601,7 +2617,7 @@ nsChromeRegistry::ProcessManifestBuffer(

       }

       if (badFlag || stApp == eBad || stAppVersion == eBad ||

-          stOs == eBad || stOsVersion == eBad)

+          stOs == eBad || stOsVersion == eBad || stDesktop == eBad)

         continue;

       nsCOMPtr<nsIURI> baseuri, overlayuri;

@@ -2640,6 +2656,7 @@ nsChromeRegistry::ProcessManifestBuffer(

       TriState stApp = eUnspecified;

       TriState stOs = eUnspecified;

       TriState stOsVersion = eUnspecified;

+      TriState stDesktop = eUnspecified;

       PRBool badFlag = PR_FALSE;

@@ -2650,6 +2667,7 @@ nsChromeRegistry::ProcessManifestBuffer(

         if (CheckStringFlag(kApplication, wtoken, appID, stApp) ||

             CheckStringFlag(kOs, wtoken, osTarget, stOs) ||

+            CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) ||

             CheckVersionFlag(kOsVersion, wtoken, osVersion, vc, stOsVersion) ||

             CheckVersionFlag(kAppVersion, wtoken, appVersion, vc, stAppVersion))

           continue;

@@ -2661,7 +2679,7 @@ nsChromeRegistry::ProcessManifestBuffer(

       }

       if (badFlag || stApp == eBad || stAppVersion == eBad ||

-          stOs == eBad || stOsVersion == eBad)

+          stOs == eBad || stOsVersion == eBad || stDesktop == eBad)

         continue;

       nsCOMPtr<nsIURI> chromeuri, resolveduri;

@@ -2702,6 +2720,7 @@ nsChromeRegistry::ProcessManifestBuffer(

       TriState stApp = eUnspecified;

       TriState stOsVersion = eUnspecified;

       TriState stOs = eUnspecified;

+      TriState stDesktop = eUnspecified;

       PRBool badFlag = PR_FALSE;

@@ -2712,6 +2731,7 @@ nsChromeRegistry::ProcessManifestBuffer(

         if (CheckStringFlag(kApplication, wtoken, appID, stApp) ||

             CheckStringFlag(kOs, wtoken, osTarget, stOs) ||

+            CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) ||

             CheckVersionFlag(kOsVersion, wtoken, osVersion, vc, stOsVersion) ||

             CheckVersionFlag(kAppVersion, wtoken, appVersion, vc, stAppVersion))

           continue;

@@ -2723,7 +2743,7 @@ nsChromeRegistry::ProcessManifestBuffer(

       }

       if (badFlag || stApp == eBad || stAppVersion == eBad || 

-          stOs == eBad || stOsVersion == eBad)

+          stOs == eBad || stOsVersion == eBad || stDesktop == eBad)

         continue;

       nsDependentCString host(package);

--- mozilla/modules/libpref/src/Makefile.in.sav	2009-09-14 10:00:21.000000000 +0200

+++ mozilla/modules/libpref/src/Makefile.in	2009-09-14 10:04:14.000000000 +0200

@@ -97,3 +97,5 @@ nsPrefService.$(OBJ_SUFFIX): nsPrefServi

 	@$(MAKE_DEPS_AUTO_CXX)

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

 endif

+

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

--- mozilla/modules/libpref/src/nsPrefService.cpp.sav	2009-09-14 10:00:21.000000000 +0200

+++ mozilla/modules/libpref/src/nsPrefService.cpp	2009-09-14 10:04:14.000000000 +0200

@@ -51,6 +51,7 @@

 #include "nsCOMArray.h"

 #include "nsXPCOMCID.h"

 #include "nsAutoPtr.h"

+#include "nsKDEUtils.h"

 #include "nsQuickSort.h"

 #include "prmem.h"

@@ -606,7 +607,8 @@ pref_LoadPrefsInDir(nsIFile* aDir, char

   return rv;

 }

-static nsresult pref_LoadPrefsInDirList(const char *listId)

+static nsresult pref_LoadPrefsInDirList(const char *listId,

+    char const *const *aSpecialFiles = NULL, PRUint32 aSpecialFilesCount = 0)

 {

   nsresult rv;

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

@@ -625,7 +627,7 @@ static nsresult pref_LoadPrefsInDirList(

         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, aSpecialFiles, aSpecialFilesCount); 

         }

       }

     }

@@ -676,6 +678,7 @@ static nsresult pref_InitInitialObjects(

 #if defined(MOZ_WIDGET_PHOTON)

 	  , "photon.js"

 #endif		 

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

 #elif defined(XP_OS2)

       "os2pref.js"

 #elif defined(XP_BEOS)

@@ -683,12 +686,23 @@ static nsresult pref_InitInitialObjects(

 #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.");

   }

-  rv = pref_LoadPrefsInDirList(NS_APP_PREFS_DEFAULTS_DIR_LIST);

+  rv = pref_LoadPrefsInDirList(NS_APP_PREFS_DEFAULTS_DIR_LIST, specialFiles, NS_ARRAY_LENGTH(specialFiles));

   NS_ENSURE_SUCCESS(rv, rv);

   NS_CreateServicesFromCategory(NS_PREFSERVICE_APPDEFAULTS_TOPIC_ID,

--- mozilla/toolkit/components/downloads/src/Makefile.in.sav	2009-09-14 10:00:21.000000000 +0200

+++ mozilla/toolkit/components/downloads/src/Makefile.in	2009-09-14 10:04:14.000000000 +0200

@@ -100,3 +100,4 @@ include $(topsrcdir)/config/rules.mk

 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)

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

--- mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp.sav	2009-09-14 10:00:21.000000000 +0200

+++ mozilla/toolkit/components/downloads/src/nsDownloadManager.cpp	2009-09-14 10:04:14.000000000 +0200

@@ -85,6 +85,7 @@

 #include "nsDocShellCID.h"

 #include "nsIPrivateBrowsingService.h"

 #include "nsNetCID.h"

+#include "nsKDEUtils.h"

 #if defined(XP_WIN) && !defined(WINCE) 

 #include <shlobj.h>

@@ -2299,6 +2300,15 @@ nsDownload::SetState(DownloadState aStat

         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);

@@ -2334,6 +2344,7 @@ nsDownload::SetState(DownloadState aStat

                   EmptyString());

             }

         }

+        } // end non-KDE block

       }

 #if defined(XP_WIN) && !defined(WINCE)

       nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget);

--- mozilla/toolkit/content/jar.mn.sav	2009-09-14 10:00:21.000000000 +0200

+++ mozilla/toolkit/content/jar.mn	2009-09-14 10:04:14.000000000 +0200

@@ -43,6 +43,8 @@ toolkit.jar:

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

@@ -56,6 +58,8 @@ toolkit.jar:

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

--- mozilla/toolkit/content/widgets/dialog-kde.xml.sav	2009-09-14 10:00:21.000000000 +0200

+++ mozilla/toolkit/content/widgets/dialog-kde.xml	2009-09-14 10:04:14.000000000 +0200

@@ -19,7 +19,7 @@

       <xul:hbox class="dialog-button-box" anonid="buttons"

                 xbl:inherits="pack=buttonpack,align=buttonalign,dir=buttondir,orient=buttonorient"

-#ifdef XP_UNIX

+#ifdef XP_UNIX_GNOME

                 >

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

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

@@ -28,6 +28,15 @@

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

--- mozilla/toolkit/content/widgets/preferences-kde.xml.sav	2009-09-14 10:00:21.000000000 +0200

+++ mozilla/toolkit/content/widgets/preferences-kde.xml	2009-09-14 10:04:14.000000000 +0200

@@ -573,7 +573,7 @@

         </xul:deck>

       </xul:hbox>

       <xul:hbox anonid="dlg-buttons" class="prefWindow-dlgbuttons"

-#ifdef XP_UNIX

+#ifdef XP_UNIX_GNOME

                 >

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

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

@@ -582,6 +582,15 @@

         <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

+                pack="end">

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

+        <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="disclosure" class="dialog-button" hidden="true"/>

 #else

                 pack="end">

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

--- mozilla/toolkit/system/unixproxy/Makefile.in.sav	2009-09-14 10:00:21.000000000 +0200

+++ mozilla/toolkit/system/unixproxy/Makefile.in	2009-09-14 10:04:14.000000000 +0200

@@ -64,4 +64,6 @@ CPPSRCS = \

         nsUnixSystemProxySettings.cpp \

         $(NULL)

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

+

 include $(topsrcdir)/config/rules.mk

--- mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp.sav	2009-09-14 10:00:21.000000000 +0200

+++ mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp	2009-09-14 10:04:14.000000000 +0200

@@ -49,6 +49,8 @@

 #include "nsPrintfCString.h"

 #include "nsNetUtil.h"

 #include "nsISupportsPrimitives.h"

+#include "nsVoidArray.h"

+#include "nsKDEUtils.h"

 class nsUnixSystemProxySettings : public nsISystemProxySettings {

 public:

@@ -65,6 +67,7 @@ private:

   PRBool IsProxyMode(const char* aMode);

   nsresult SetProxyResultFromGConf(const char* aKeyBase, const char* aType, nsACString& aResult);

   nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult);

+  nsresult GetProxyFromKDE(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult);

 };

 NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings)

@@ -412,6 +415,9 @@ nsUnixSystemProxySettings::GetProxyForUR

   rv = aURI->GetPort(&port);

   NS_ENSURE_SUCCESS(rv, rv);

+  if( nsKDEUtils::kdeSupport())

+    return GetProxyFromKDE( scheme, host, port, aResult );

+

   if (!mGConf)

     return GetProxyFromEnvironment(scheme, host, port, aResult);

@@ -432,3 +438,28 @@ static const nsModuleComponentInfo compo

 };

 NS_IMPL_NSGETMODULE(nsUnixProxyModule, components)

+

+nsresult

+nsUnixSystemProxySettings::GetProxyFromKDE(const nsACString& aScheme,

+                                             const nsACString& aHost,

+                                             PRInt32 aPort,

+                                             nsACString& aResult)

+{

+  nsCAutoString url;

+  url = aScheme;

+  url += "://";

+  url += aHost;

+  if( aPort >= 0 )

+      {

+      url += ":";

+      url += nsPrintfCString("%d", aPort);

+      }

+  nsCStringArray command;

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

+  command.AppendCString( url );

+  nsCStringArray result;

+  if( !nsKDEUtils::command( command, &result ) || result.Count() != 1 )

+      return NS_ERROR_FAILURE;

+  aResult = *result[ 0 ];

+  return NS_OK;

+}

--- mozilla/toolkit/xre/Makefile.in.sav	2009-09-14 10:00:21.000000000 +0200

+++ mozilla/toolkit/xre/Makefile.in	2009-09-14 10:04:14.000000000 +0200

@@ -98,6 +98,7 @@ endif

 EXPORTS = \

 	xrecore.h \

 	nsXULAppAPI.h \

+	nsKDEUtils.h \

 	$(NULL)

 CPPSRCS = \

@@ -133,7 +134,7 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),beos)

 CPPSRCS += nsNativeAppSupportBeOS.cpp

 else

 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)

-CPPSRCS += nsNativeAppSupportUnix.cpp

+CPPSRCS += nsNativeAppSupportUnix.cpp nsKDEUtils.cpp

 else

 CPPSRCS += nsNativeAppSupportDefault.cpp

 endif

--- mozilla/toolkit/xre/nsKDEUtils.cpp.sav	2009-09-14 10:00:21.000000000 +0200

+++ mozilla/toolkit/xre/nsKDEUtils.cpp	2009-09-14 10:04:14.000000000 +0200

@@ -0,0 +1,329 @@

+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */

+/* ***** BEGIN LICENSE BLOCK *****

+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1

+ *

+ * The contents of this file are subject to the Mozilla Public License Version

+ * 1.1 (the "License"); you may not use this file except in compliance with

+ * the License. You may obtain a copy of the License at

+ * http://www.mozilla.org/MPL/

+ *

+ * Software distributed under the License is distributed on an "AS IS" basis,

+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

+ * for the specific language governing rights and limitations under the

+ * License.

+ *

+ * The Original Code is Unix Native App Support.

+ *

+ * The Initial Developer of the Original Code is

+ * Mozilla Corporation.

+ * Portions created by the Initial Developer are Copyright (C) 2007

+ * the Initial Developer. All Rights Reserved.

+ *

+ * Contributor(s):

+ *