diff -r 418b5f502ff2 -r ccddc8555cdb mozilla-kde.patch
--- a/mozilla-kde.patch	Wed Jun 22 09:02:07 2011 +0200
+++ b/mozilla-kde.patch	Thu Jun 23 22:31:54 2011 +0200
@@ -2135,6 +2135,41 @@
  
  #define NS_UNIXSYSTEMPROXYSERVICE_CID  /* 0fa3158c-d5a7-43de-9181-a285e74cf1d4 */\
       { 0x0fa3158c, 0xd5a7, 0x43de, \
+@@ -437,8 +443,34 @@ static const mozilla::Module::ContractID
+ 
+ static const mozilla::Module kUnixProxyModule = {
+   mozilla::Module::kVersion,
+   kUnixProxyCIDs,
+   kUnixProxyContracts
+ };
+ 
+ NSMODULE_DEFN(nsUnixProxyModule) = &kUnixProxyModule;
++
++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;
++}
++
 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
 --- a/toolkit/xre/Makefile.in
 +++ b/toolkit/xre/Makefile.in