1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 372d46509a8899feb3473becff869159d01f1f4c |
2 # Parent 5f8cbb078ab0d5696255c2f514c6333666b47da9 |
3 Description: Add KDE integration to Firefox (toolkit parts) |
3 Description: Add KDE integration to Firefox (toolkit parts) |
4 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
4 Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> |
5 Author: Lubos Lunak <lunak@suse.com> |
5 Author: Lubos Lunak <lunak@suse.com> |
6 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
6 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 |
7 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
7 https://bugzilla.novell.com/show_bug.cgi?id=170055 |
2134 +# PrefWindow I (June 4, 1999) |
2134 +# PrefWindow I (June 4, 1999) |
2135 +# |
2135 +# |
2136 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
2136 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
2137 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
2137 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
2138 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
2138 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
2139 @@ -14,16 +14,18 @@ |
2139 @@ -14,16 +14,17 @@ |
2140 #include "prenv.h" |
2140 #include "prenv.h" |
2141 #include "nsPrintfCString.h" |
2141 #include "nsPrintfCString.h" |
2142 #include "nsNetUtil.h" |
2142 #include "nsNetUtil.h" |
2143 #include "nsISupportsPrimitives.h" |
2143 #include "nsISupportsPrimitives.h" |
2144 #include "nsIGSettingsService.h" |
2144 #include "nsIGSettingsService.h" |
2145 #include "nsInterfaceHashtable.h" |
2145 #include "nsInterfaceHashtable.h" |
2146 #include "mozilla/Attributes.h" |
2146 #include "mozilla/Attributes.h" |
2147 #include "nsIURI.h" |
2147 #include "nsIURI.h" |
2148 +#include "nsVoidArray.h" |
|
2149 +#include "nsKDEUtils.h" |
2148 +#include "nsKDEUtils.h" |
2150 |
2149 |
2151 class nsUnixSystemProxySettings final : public nsISystemProxySettings { |
2150 class nsUnixSystemProxySettings final : public nsISystemProxySettings { |
2152 public: |
2151 public: |
2153 NS_DECL_ISUPPORTS |
2152 NS_DECL_ISUPPORTS |
2154 NS_DECL_NSISYSTEMPROXYSETTINGS |
2153 NS_DECL_NSISYSTEMPROXYSETTINGS |
2155 |
2154 |
2156 nsUnixSystemProxySettings() |
2155 nsUnixSystemProxySettings() |
2157 : mSchemeProxySettings(4) |
2156 : mSchemeProxySettings(4) |
2158 @@ -38,16 +40,17 @@ private: |
2157 @@ -38,16 +39,17 @@ private: |
2159 nsCOMPtr<nsIGSettingsService> mGSettings; |
2158 nsCOMPtr<nsIGSettingsService> mGSettings; |
2160 nsCOMPtr<nsIGSettingsCollection> mProxySettings; |
2159 nsCOMPtr<nsIGSettingsCollection> mProxySettings; |
2161 nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings; |
2160 nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings; |
2162 bool IsProxyMode(const char* aMode); |
2161 bool IsProxyMode(const char* aMode); |
2163 nsresult SetProxyResultFromGConf(const char* aKeyBase, const char* aType, nsACString& aResult); |
2162 nsresult SetProxyResultFromGConf(const char* aKeyBase, const char* aType, nsACString& aResult); |
2171 |
2170 |
2172 NS_IMETHODIMP |
2171 NS_IMETHODIMP |
2173 nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly) |
2172 nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly) |
2174 { |
2173 { |
2175 // dbus prevents us from being threadsafe, but this routine should not block anyhow |
2174 // dbus prevents us from being threadsafe, but this routine should not block anyhow |
2176 @@ -504,16 +507,19 @@ nsUnixSystemProxySettings::GetProxyFromG |
2175 @@ -504,16 +506,19 @@ nsUnixSystemProxySettings::GetProxyFromG |
2177 |
2176 |
2178 nsresult |
2177 nsresult |
2179 nsUnixSystemProxySettings::GetProxyForURI(const nsACString & aSpec, |
2178 nsUnixSystemProxySettings::GetProxyForURI(const nsACString & aSpec, |
2180 const nsACString & aScheme, |
2179 const nsACString & aScheme, |
2181 const nsACString & aHost, |
2180 const nsACString & aHost, |
2191 return rv; |
2190 return rv; |
2192 } |
2191 } |
2193 if (mGConf) |
2192 if (mGConf) |
2194 return GetProxyFromGConf(aScheme, aHost, aPort, aResult); |
2193 return GetProxyFromGConf(aScheme, aHost, aPort, aResult); |
2195 |
2194 |
2196 @@ -539,8 +545,34 @@ static const mozilla::Module::ContractID |
2195 @@ -539,8 +544,34 @@ static const mozilla::Module::ContractID |
2197 |
2196 |
2198 static const mozilla::Module kUnixProxyModule = { |
2197 static const mozilla::Module kUnixProxyModule = { |
2199 mozilla::Module::kVersion, |
2198 mozilla::Module::kVersion, |
2200 kUnixProxyCIDs, |
2199 kUnixProxyCIDs, |
2201 kUnixProxyContracts |
2200 kUnixProxyContracts |
2691 CXXFLAGS += CONFIG['TK_CFLAGS'] |
2690 CXXFLAGS += CONFIG['TK_CFLAGS'] |
2692 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
2691 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
2693 new file mode 100644 |
2692 new file mode 100644 |
2694 --- /dev/null |
2693 --- /dev/null |
2695 +++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
2694 +++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp |
2696 @@ -0,0 +1,54 @@ |
2695 @@ -0,0 +1,53 @@ |
2697 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
2696 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
2698 +/* This Source Code Form is subject to the terms of the Mozilla Public |
2697 +/* This Source Code Form is subject to the terms of the Mozilla Public |
2699 + * License, v. 2.0. If a copy of the MPL was not distributed with this |
2698 + * License, v. 2.0. If a copy of the MPL was not distributed with this |
2700 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
2699 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
2701 + |
2700 + |
2702 +#include "nsCommonRegistry.h" |
2701 +#include "nsCommonRegistry.h" |
2703 + |
2702 + |
2704 +#include "nsGNOMERegistry.h" |
2703 +#include "nsGNOMERegistry.h" |
2705 +#include "nsKDERegistry.h" |
2704 +#include "nsKDERegistry.h" |
2706 +#include "nsString.h" |
2705 +#include "nsString.h" |
2707 +#include "nsVoidArray.h" |
|
2708 +#include "nsKDEUtils.h" |
2706 +#include "nsKDEUtils.h" |
2709 + |
2707 + |
2710 +/* static */ bool |
2708 +/* static */ bool |
2711 +nsCommonRegistry::HandlerExists(const char *aProtocolScheme) |
2709 +nsCommonRegistry::HandlerExists(const char *aProtocolScheme) |
2712 +{ |
2710 +{ |