equal
deleted
inserted
replaced
7 retrieving revision 1.1 |
7 retrieving revision 1.1 |
8 |
8 |
9 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
9 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
10 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
10 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
11 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
11 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp |
12 @@ -74,22 +74,28 @@ private: |
12 @@ -50,22 +50,28 @@ nsUnixSystemProxySettings::GetMainThread |
13 nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType, nsACString& aResult); |
13 // dbus prevents us from being threadsafe, but this routine should not block anyhow |
14 }; |
14 *aMainThreadOnly = true; |
15 |
15 return NS_OK; |
16 NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings) |
16 } |
17 |
17 |
18 nsresult |
18 nsresult |
19 nsUnixSystemProxySettings::Init() |
19 nsUnixSystemProxySettings::Init() |
20 { |
20 { |
21 - mSchemeProxySettings.Init(5); |
21 - mSchemeProxySettings.Init(5); |