mozilla-kde.patch
changeset 284 ccddc8555cdb
parent 260 a9a2a9c8b831
child 289 3c0dff7ca9c4
equal deleted inserted replaced
283:418b5f502ff2 284:ccddc8555cdb
  2133    return GetProxyFromGConf(scheme, host, port, aResult);
  2133    return GetProxyFromGConf(scheme, host, port, aResult);
  2134  }
  2134  }
  2135  
  2135  
  2136  #define NS_UNIXSYSTEMPROXYSERVICE_CID  /* 0fa3158c-d5a7-43de-9181-a285e74cf1d4 */\
  2136  #define NS_UNIXSYSTEMPROXYSERVICE_CID  /* 0fa3158c-d5a7-43de-9181-a285e74cf1d4 */\
  2137       { 0x0fa3158c, 0xd5a7, 0x43de, \
  2137       { 0x0fa3158c, 0xd5a7, 0x43de, \
       
  2138 @@ -437,8 +443,34 @@ static const mozilla::Module::ContractID
       
  2139  
       
  2140  static const mozilla::Module kUnixProxyModule = {
       
  2141    mozilla::Module::kVersion,
       
  2142    kUnixProxyCIDs,
       
  2143    kUnixProxyContracts
       
  2144  };
       
  2145  
       
  2146  NSMODULE_DEFN(nsUnixProxyModule) = &kUnixProxyModule;
       
  2147 +
       
  2148 +nsresult
       
  2149 +nsUnixSystemProxySettings::GetProxyFromKDE(const nsACString& aScheme,
       
  2150 +                                           const nsACString& aHost,
       
  2151 +                                           PRInt32 aPort,
       
  2152 +                                           nsACString& aResult)
       
  2153 +{
       
  2154 +  nsCAutoString url;
       
  2155 +  url = aScheme;
       
  2156 +  url += "://";
       
  2157 +  url += aHost;
       
  2158 +  if( aPort >= 0 )
       
  2159 +  {
       
  2160 +    url += ":";
       
  2161 +    url += nsPrintfCString("%d", aPort);
       
  2162 +  }
       
  2163 +  nsCStringArray command;
       
  2164 +  command.AppendCString( NS_LITERAL_CSTRING( "GETPROXY" ));
       
  2165 +  command.AppendCString( url );
       
  2166 +  nsCStringArray result;
       
  2167 +  if( !nsKDEUtils::command( command, &result ) || result.Count() != 1 )
       
  2168 +    return NS_ERROR_FAILURE;
       
  2169 +  aResult = *result[ 0 ];
       
  2170 +  return NS_OK;
       
  2171 +}
       
  2172 +
  2138 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
  2173 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
  2139 --- a/toolkit/xre/Makefile.in
  2174 --- a/toolkit/xre/Makefile.in
  2140 +++ b/toolkit/xre/Makefile.in
  2175 +++ b/toolkit/xre/Makefile.in
  2141 @@ -94,17 +94,18 @@ EXPORTS = nsWindowsDllInterceptor.h
  2176 @@ -94,17 +94,18 @@ EXPORTS = nsWindowsDllInterceptor.h
  2142  else
  2177  else