diff -r 791f19dc8023 -r 37558f4844c0 mozilla-libproxy.patch --- a/mozilla-libproxy.patch Thu Jul 01 08:11:24 2010 +0200 +++ b/mozilla-libproxy.patch Sun Jul 18 14:43:56 2010 +0200 @@ -6,7 +6,7 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -539,16 +539,20 @@ FT2_CFLAGS = @FT2_CFLAGS@ +@@ -542,16 +542,20 @@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_LIBS = @FT2_LIBS@ MOZ_PANGO_CFLAGS = @MOZ_PANGO_CFLAGS@ @@ -30,7 +30,7 @@ diff --git a/config/system-headers b/config/system-headers --- a/config/system-headers +++ b/config/system-headers -@@ -1013,8 +1013,11 @@ hunspell.hxx +@@ -1013,11 +1013,14 @@ hunspell.hxx #if MOZ_NATIVE_BZ2==1 bzlib.h #endif @@ -42,10 +42,13 @@ +#ifdef MOZ_ENABLE_LIBPROXY +proxy.h +#endif + #if MOZ_NATIVE_LIBEVENT==1 + event.h + #endif diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -5289,16 +5289,39 @@ then +@@ -5325,16 +5325,39 @@ then AC_DEFINE(MOZ_ENABLE_DBUS) fi fi @@ -226,8 +229,8 @@ + +private: + ~nsUnixSystemProxySettings() { -+ if (mProxyFactory) -+ px_proxy_factory_free(mProxyFactory); ++ if (mProxyFactory) ++ px_proxy_factory_free(mProxyFactory); + } + + pxProxyFactory *mProxyFactory; @@ -288,9 +291,9 @@ + nsXPIDLCString hostPortString; + nsCOMPtr proxyURI; + -+ rv = mIOService->NewURI(nsDependentCString(proxyArray[c]), -+ nsnull, -+ nsnull, ++ rv = mIOService->NewURI(nsDependentCString(proxyArray[c]), ++ nsnull, ++ nsnull, + getter_AddRefs(proxyURI)); + NS_ENSURE_SUCCESS(rv, rv); +