4 https://bugzilla.mozilla.org/show_bug.cgi?id=517655 |
4 https://bugzilla.mozilla.org/show_bug.cgi?id=517655 |
5 |
5 |
6 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in |
6 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in |
7 --- a/config/autoconf.mk.in |
7 --- a/config/autoconf.mk.in |
8 +++ b/config/autoconf.mk.in |
8 +++ b/config/autoconf.mk.in |
9 @@ -538,16 +538,20 @@ FT2_CFLAGS = @FT2_CFLAGS@ |
9 @@ -541,16 +541,20 @@ FT2_CFLAGS = @FT2_CFLAGS@ |
10 FT2_LIBS = @FT2_LIBS@ |
10 FT2_LIBS = @FT2_LIBS@ |
11 |
11 |
12 MOZ_PANGO_CFLAGS = @MOZ_PANGO_CFLAGS@ |
12 MOZ_PANGO_CFLAGS = @MOZ_PANGO_CFLAGS@ |
13 MOZ_PANGO_LIBS = @MOZ_PANGO_LIBS@ |
13 MOZ_PANGO_LIBS = @MOZ_PANGO_LIBS@ |
14 |
14 |
44 +#endif |
44 +#endif |
45 + |
45 + |
46 diff --git a/configure.in b/configure.in |
46 diff --git a/configure.in b/configure.in |
47 --- a/configure.in |
47 --- a/configure.in |
48 +++ b/configure.in |
48 +++ b/configure.in |
49 @@ -5564,16 +5564,39 @@ then |
49 @@ -5536,16 +5536,39 @@ then |
50 fi |
50 fi |
51 |
51 |
52 AC_SUBST(MOZ_ENABLE_GCONF) |
52 AC_SUBST(MOZ_ENABLE_GCONF) |
53 AC_SUBST(MOZ_GCONF_CFLAGS) |
53 AC_SUBST(MOZ_GCONF_CFLAGS) |
54 AC_SUBST(MOZ_GCONF_LIBS) |
54 AC_SUBST(MOZ_GCONF_LIBS) |
165 include $(topsrcdir)/config/rules.mk |
165 include $(topsrcdir)/config/rules.mk |
166 diff --git a/toolkit/system/unixproxy/nsLibProxySettings.cpp b/toolkit/system/unixproxy/nsLibProxySettings.cpp |
166 diff --git a/toolkit/system/unixproxy/nsLibProxySettings.cpp b/toolkit/system/unixproxy/nsLibProxySettings.cpp |
167 new file mode 100644 |
167 new file mode 100644 |
168 --- /dev/null |
168 --- /dev/null |
169 +++ b/toolkit/system/unixproxy/nsLibProxySettings.cpp |
169 +++ b/toolkit/system/unixproxy/nsLibProxySettings.cpp |
170 @@ -0,0 +1,162 @@ |
170 @@ -0,0 +1,173 @@ |
171 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
171 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
172 +/* ***** BEGIN LICENSE BLOCK ***** |
172 +/* ***** BEGIN LICENSE BLOCK ***** |
173 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
173 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
174 + * |
174 + * |
175 + * The contents of this file are subject to the Mozilla Public License Version |
175 + * The contents of this file are subject to the Mozilla Public License Version |
204 + * the terms of any one of the MPL, the GPL or the LGPL. |
204 + * the terms of any one of the MPL, the GPL or the LGPL. |
205 + * |
205 + * |
206 + * ***** END LICENSE BLOCK ***** */ |
206 + * ***** END LICENSE BLOCK ***** */ |
207 + |
207 + |
208 +#include "nsISystemProxySettings.h" |
208 +#include "nsISystemProxySettings.h" |
209 +#include "nsIGenericFactory.h" |
209 +#include "mozilla/ModuleUtils.h" |
210 +#include "nsIServiceManager.h" |
210 +#include "nsIServiceManager.h" |
211 +#include "nsIIOService.h" |
211 +#include "nsIIOService.h" |
212 +#include "nsIURI.h" |
212 +#include "nsIURI.h" |
213 +#include "nsString.h" |
213 +#include "nsString.h" |
214 +#include "nsNetUtil.h" |
214 +#include "nsNetUtil.h" |
319 +#define NS_UNIXSYSTEMPROXYSERVICE_CID /* 0fa3158c-d5a7-43de-9181-a285e74cf1d4 */\ |
319 +#define NS_UNIXSYSTEMPROXYSERVICE_CID /* 0fa3158c-d5a7-43de-9181-a285e74cf1d4 */\ |
320 + { 0x0fa3158c, 0xd5a7, 0x43de, \ |
320 + { 0x0fa3158c, 0xd5a7, 0x43de, \ |
321 + {0x91, 0x81, 0xa2, 0x85, 0xe7, 0x4c, 0xf1, 0xd4 } } |
321 + {0x91, 0x81, 0xa2, 0x85, 0xe7, 0x4c, 0xf1, 0xd4 } } |
322 + |
322 + |
323 +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUnixSystemProxySettings, Init) |
323 +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUnixSystemProxySettings, Init) |
324 + |
324 +NS_DEFINE_NAMED_CID(NS_UNIXSYSTEMPROXYSERVICE_CID); |
325 +static const nsModuleComponentInfo components[] = { |
325 + |
326 + { "Unix System Proxy Settings Service", |
326 +static const mozilla::Module::CIDEntry kUnixProxyCIDs[] = { |
327 + NS_UNIXSYSTEMPROXYSERVICE_CID, |
327 + { &kNS_UNIXSYSTEMPROXYSERVICE_CID, false, NULL, nsUnixSystemProxySettingsConstructor }, |
328 + NS_SYSTEMPROXYSETTINGS_CONTRACTID, |
328 + { NULL } |
329 + nsUnixSystemProxySettingsConstructor } |
|
330 +}; |
329 +}; |
331 + |
330 + |
332 +NS_IMPL_NSGETMODULE(nsUnixProxyModule, components) |
331 +static const mozilla::Module::ContractIDEntry kUnixProxyContracts[] = { |
|
332 + { NS_SYSTEMPROXYSETTINGS_CONTRACTID, &kNS_UNIXSYSTEMPROXYSERVICE_CID }, |
|
333 + { NULL } |
|
334 +}; |
|
335 + |
|
336 +static const mozilla::Module kUnixProxyModule = { |
|
337 + mozilla::Module::kVersion, |
|
338 + kUnixProxyCIDs, |
|
339 + kUnixProxyContracts |
|
340 +}; |
|
341 + |
|
342 +NSMODULE_DEFN(nsUnixProxyModule) = &kUnixProxyModule; |
|
343 + |