Mercurial Mercurial > hg > mozilla / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mozilla-kde.patch
changeset 596 9124c1a643c5
parent 589 b3ff3d8ebf9d
child 606 9d39369e1b4c
equal deleted inserted replaced
595:31f273919032 596:9124c1a643c5 
  2112                                            const nsACString & aScheme,
 
  2112                                            const nsACString & aScheme,
 
  2113                                            const nsACString & aHost,
 
  2113                                            const nsACString & aHost,
 
  2114                                            const int32_t      aPort,
 
  2114                                            const int32_t      aPort,
 
  2115                                            nsACString & aResult)
 
  2115                                            nsACString & aResult)
 
  2116  {
 
  2116  {
 
  2117 +  if( nsKDEUtils::kdeSupport()) {
 
  2117 +  if (nsKDEUtils::kdeSupport())
 
  2118 +    return GetProxyFromKDE(aScheme, aHost, aPort, aResult);
 
  2118 +    return GetProxyFromKDE(aScheme, aHost, aPort, aResult);
 
  2119 +
 
  2119 +
 
  2120    if (mProxySettings) {
 
  2120    if (mProxySettings) {
 
  2121      nsresult rv = GetProxyFromGSettings(aScheme, aHost, aPort, aResult);
 
  2121      nsresult rv = GetProxyFromGSettings(aScheme, aHost, aPort, aResult);
 
  2122      if (NS_SUCCEEDED(rv))
 
  2122      if (NS_SUCCEEDED(rv))
mozilla