mozilla-nongnome-proxies.patch
changeset 568 2c74c5927ea2
parent 419 f6b055dd94bc
child 650 e8c83b144fd1
--- a/mozilla-nongnome-proxies.patch	Wed Oct 24 10:25:01 2012 +0200
+++ b/mozilla-nongnome-proxies.patch	Fri Oct 26 13:01:33 2012 +0200
@@ -9,11 +9,11 @@
 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
 --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
 +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
-@@ -74,22 +74,28 @@ private:
-   nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType, nsACString& aResult);
- };
- 
- NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings)
+@@ -50,22 +50,28 @@ nsUnixSystemProxySettings::GetMainThread
+   // dbus prevents us from being threadsafe, but this routine should not block anyhow
+   *aMainThreadOnly = true;
+   return NS_OK;
+ }
  
  nsresult
  nsUnixSystemProxySettings::Init()