author | Wolfgang Rosenauer <wr@rosenauer.org> |
Thu, 22 Jul 2010 08:38:28 +0200 | |
changeset 101 | 1678af7b5183 |
parent 94 | 7177cac23915 |
child 115 | 5e8354f0b873 |
permissions | -rw-r--r-- |
0 | 1 |
From: Wolfgang Rosenauer <wr@rosenauer.org> |
2 |
Subject: Add the option to use libproxy for system proxy settings |
|
3 |
References: |
|
4 |
https://bugzilla.mozilla.org/show_bug.cgi?id=517655 |
|
5 |
||
6 |
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in |
|
7 |
--- a/config/autoconf.mk.in |
|
8 |
+++ b/config/autoconf.mk.in |
|
94
7177cac23915
Update to snapshot 20100707
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
9 |
@@ -541,16 +541,20 @@ FT2_CFLAGS = @FT2_CFLAGS@ |
0 | 10 |
FT2_LIBS = @FT2_LIBS@ |
11 |
||
12 |
MOZ_PANGO_CFLAGS = @MOZ_PANGO_CFLAGS@ |
|
13 |
MOZ_PANGO_LIBS = @MOZ_PANGO_LIBS@ |
|
14 |
||
15 |
MOZ_XIE_LIBS = @MOZ_XIE_LIBS@ |
|
16 |
XT_LIBS = @XT_LIBS@ |
|
17 |
||
18 |
+MOZ_LIBPROXY_CFLAGS = @MOZ_LIBPROXY_CFLAGS@ |
|
19 |
+MOZ_LIBPROXY_LIBS = @MOZ_LIBPROXY_LIBS@ |
|
20 |
+MOZ_ENABLE_LIBPROXY = @MOZ_ENABLE_LIBPROXY@ |
|
21 |
+ |
|
22 |
MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CFLAGS@ |
|
23 |
MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS@ |
|
24 |
MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@ |
|
25 |
||
77
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
26 |
MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ |
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
27 |
|
0 | 28 |
GLIB_CFLAGS = @GLIB_CFLAGS@ |
29 |
GLIB_LIBS = @GLIB_LIBS@ |
|
30 |
diff --git a/config/system-headers b/config/system-headers |
|
31 |
--- a/config/system-headers |
|
32 |
+++ b/config/system-headers |
|
77
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
33 |
@@ -1028,8 +1028,12 @@ gio/gio.h |
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
34 |
#ifdef MOZ_ENABLE_LIBCONIC |
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
35 |
conic/conicconnection.h |
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
36 |
conic/conicconnectionevent.h |
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
37 |
conic/conicstatisticsevent.h |
0 | 38 |
#endif |
77
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
39 |
#if MOZ_NATIVE_LIBEVENT==1 |
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
40 |
event.h |
59
604517bb16d8
Update to 1.9.2.2/3.6.2
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
0
diff
changeset
|
41 |
#endif |
0 | 42 |
+#ifdef MOZ_ENABLE_LIBPROXY |
43 |
+proxy.h |
|
44 |
+#endif |
|
77
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
45 |
+ |
0 | 46 |
diff --git a/configure.in b/configure.in |
47 |
--- a/configure.in |
|
48 |
+++ b/configure.in |
|
94
7177cac23915
Update to snapshot 20100707
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
49 |
@@ -5536,16 +5536,39 @@ then |
0 | 50 |
fi |
77
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
51 |
|
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
52 |
AC_SUBST(MOZ_ENABLE_GCONF) |
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
53 |
AC_SUBST(MOZ_GCONF_CFLAGS) |
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
54 |
AC_SUBST(MOZ_GCONF_LIBS) |
0 | 55 |
fi |
56 |
||
57 |
dnl ======================================================== |
|
58 |
+dnl = libproxy support |
|
59 |
+dnl ======================================================== |
|
60 |
+ |
|
61 |
+if test "$MOZ_ENABLE_GTK2" |
|
62 |
+then |
|
63 |
+ MOZ_ENABLE_LIBPROXY= |
|
64 |
+ |
|
65 |
+ MOZ_ARG_ENABLE_BOOL(libproxy, |
|
66 |
+ [ --enable-libproxy Enable libproxy support ], |
|
67 |
+ MOZ_ENABLE_LIBPROXY=1, |
|
68 |
+ MOZ_ENABLE_LIBPROXY=) |
|
69 |
+ |
|
70 |
+ if test "$MOZ_ENABLE_LIBPROXY" |
|
71 |
+ then |
|
72 |
+ PKG_CHECK_MODULES(MOZ_LIBPROXY, libproxy-1.0) |
|
73 |
+ AC_DEFINE(MOZ_ENABLE_LIBPROXY) |
|
74 |
+ fi |
|
75 |
+fi |
|
76 |
+AC_SUBST(MOZ_ENABLE_LIBPROXY) |
|
77 |
+AC_SUBST(MOZ_LIBPROXY_CFLAGS) |
|
78 |
+AC_SUBST(MOZ_LIBPROXY_LIBS) |
|
79 |
+ |
|
80 |
+dnl ======================================================== |
|
81 |
dnl = libnotify support |
|
82 |
dnl ======================================================== |
|
83 |
||
84 |
if test "$MOZ_ENABLE_GTK2" |
|
85 |
then |
|
86 |
MOZ_ENABLE_LIBNOTIFY=1 |
|
87 |
||
88 |
MOZ_ARG_DISABLE_BOOL(libnotify, |
|
89 |
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
|
90 |
--- a/toolkit/library/Makefile.in |
|
91 |
+++ b/toolkit/library/Makefile.in |
|
77
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
92 |
@@ -222,16 +222,20 @@ endif |
0 | 93 |
ifdef MOZ_TREE_FREETYPE |
94 |
EXTRA_DSO_LDOPTS += $(FT2_LIBS) |
|
95 |
endif |
|
96 |
||
97 |
ifdef MOZ_ENABLE_STARTUP_NOTIFICATION |
|
98 |
EXTRA_DSO_LDOPTS += $(MOZ_STARTUP_NOTIFICATION_LIBS) |
|
99 |
endif |
|
100 |
||
101 |
+ifdef MOZ_ENABLE_LIBPROXY |
|
102 |
+EXTRA_DSO_LDOPTS += $(MOZ_LIBPROXY_LIBS) |
|
103 |
+endif |
|
104 |
+ |
|
105 |
ifeq ($(OS_ARCH),BeOS) |
|
106 |
EXTRA_DSO_LDOPTS += -lbe -ltracker |
|
107 |
endif |
|
108 |
||
109 |
ifeq ($(OS_ARCH),SunOS) |
|
77
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
110 |
EXTRA_DSO_LDOPTS += -lelf -ldemangle |
0 | 111 |
endif |
112 |
||
113 |
diff --git a/toolkit/system/unixproxy/Makefile.in b/toolkit/system/unixproxy/Makefile.in |
|
114 |
--- a/toolkit/system/unixproxy/Makefile.in |
|
115 |
+++ b/toolkit/system/unixproxy/Makefile.in |
|
116 |
@@ -15,16 +15,17 @@ |
|
117 |
# |
|
118 |
# The Initial Developer of the Original Code is |
|
119 |
# IBM Corporation. |
|
120 |
# Portions created by the Initial Developer are Copyright (C) 2004 |
|
121 |
# the Initial Developer. All Rights Reserved. |
|
122 |
# |
|
123 |
# Contributor(s): |
|
124 |
# Brian Ryner <bryner@brianryner.com> |
|
125 |
+# Wolfgang Rosenauer <wr@rosenauer.org> |
|
126 |
# |
|
127 |
# Alternatively, the contents of this file may be used under the terms of |
|
128 |
# either the GNU General Public License Version 2 or later (the "GPL"), or |
|
129 |
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
|
130 |
# in which case the provisions of the GPL or the LGPL are applicable instead |
|
131 |
# of those above. If you wish to allow use of your version of this file only |
|
132 |
# under the terms of either the GPL or the LGPL, and not to allow others to |
|
133 |
# use your version of this file under the terms of the MPL, indicate your |
|
77
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
134 |
@@ -46,16 +47,30 @@ MODULE = unixproxy |
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
135 |
LIBRARY_NAME = unixproxy |
0 | 136 |
|
77
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
137 |
EXPORT_LIBRARY = 1 |
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
138 |
IS_COMPONENT = 1 |
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
139 |
MODULE_NAME = nsUnixProxyModule |
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
140 |
GRE_MODULE = 1 |
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
141 |
LIBXUL_LIBRARY = 1 |
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
142 |
|
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
143 |
+EXTRA_DSO_LDOPTS += \ |
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
144 |
+ $(MOZ_LIBPROXY_LIBS) \ |
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
145 |
+ $(MOZ_COMPONENT_LIBS) \ |
f2df98836e17
More 1.9.2->1.9.3 patch rebasing and version changes
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
74
diff
changeset
|
146 |
+ $(NULL) |
0 | 147 |
|
148 |
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) |
|
149 |
+ifdef MOZ_ENABLE_LIBPROXY |
|
150 |
+ |
|
151 |
+CPPSRCS = \ |
|
152 |
+ nsLibProxySettings.cpp \ |
|
153 |
+ $(NULL) |
|
154 |
+ |
|
155 |
+CXXFLAGS += $(MOZ_LIBPROXY_CFLAGS) |
|
156 |
+ |
|
157 |
+else # MOZ_ENABLE_LIBPROXY |
|
158 |
||
159 |
CPPSRCS = \ |
|
160 |
nsUnixSystemProxySettings.cpp \ |
|
161 |
$(NULL) |
|
162 |
||
163 |
+endif # MOZ_ENABLE_LIBPROXY |
|
164 |
+ |
|
165 |
include $(topsrcdir)/config/rules.mk |
|
166 |
diff --git a/toolkit/system/unixproxy/nsLibProxySettings.cpp b/toolkit/system/unixproxy/nsLibProxySettings.cpp |
|
167 |
new file mode 100644 |
|
168 |
--- /dev/null |
|
169 |
+++ b/toolkit/system/unixproxy/nsLibProxySettings.cpp |
|
94
7177cac23915
Update to snapshot 20100707
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
170 |
@@ -0,0 +1,173 @@ |
0 | 171 |
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
172 |
+/* ***** BEGIN LICENSE BLOCK ***** |
|
173 |
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
|
174 |
+ * |
|
175 |
+ * The contents of this file are subject to the Mozilla Public License Version |
|
176 |
+ * 1.1 (the "License"); you may not use this file except in compliance with |
|
177 |
+ * the License. You may obtain a copy of the License at |
|
178 |
+ * http://www.mozilla.org/MPL/ |
|
179 |
+ * |
|
180 |
+ * Software distributed under the License is distributed on an "AS IS" basis, |
|
181 |
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License |
|
182 |
+ * for the specific language governing rights and limitations under the |
|
183 |
+ * License. |
|
184 |
+ * |
|
185 |
+ * The Original Code is Mozilla libproxy integration code. |
|
186 |
+ * |
|
187 |
+ * The Initial Developer of the Original Code is |
|
188 |
+ * Wolfgang Rosenauer <wr@rosenauer.org>. |
|
189 |
+ * Portions created by the Initial Developer are Copyright (C) 2009 |
|
190 |
+ * the Initial Developer. All Rights Reserved. |
|
191 |
+ * |
|
192 |
+ * Contributor(s): |
|
193 |
+ * |
|
194 |
+ * Alternatively, the contents of this file may be used under the terms of |
|
195 |
+ * either the GNU General Public License Version 2 or later (the "GPL"), or |
|
196 |
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
|
197 |
+ * in which case the provisions of the GPL or the LGPL are applicable instead |
|
198 |
+ * of those above. If you wish to allow use of your version of this file only |
|
199 |
+ * under the terms of either the GPL or the LGPL, and not to allow others to |
|
200 |
+ * use your version of this file under the terms of the MPL, indicate your |
|
201 |
+ * decision by deleting the provisions above and replace them with the notice |
|
202 |
+ * and other provisions required by the GPL or the LGPL. If you do not delete |
|
203 |
+ * the provisions above, a recipient may use your version of this file under |
|
204 |
+ * the terms of any one of the MPL, the GPL or the LGPL. |
|
205 |
+ * |
|
206 |
+ * ***** END LICENSE BLOCK ***** */ |
|
207 |
+ |
|
208 |
+#include "nsISystemProxySettings.h" |
|
94
7177cac23915
Update to snapshot 20100707
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
209 |
+#include "mozilla/ModuleUtils.h" |
0 | 210 |
+#include "nsIServiceManager.h" |
211 |
+#include "nsIIOService.h" |
|
212 |
+#include "nsIURI.h" |
|
213 |
+#include "nsString.h" |
|
214 |
+#include "nsNetUtil.h" |
|
215 |
+#include "nsCOMPtr.h" |
|
216 |
+#include "nspr.h" |
|
217 |
+ |
|
218 |
+#include <proxy.h> |
|
219 |
+ |
|
220 |
+class nsUnixSystemProxySettings : public nsISystemProxySettings { |
|
221 |
+public: |
|
222 |
+ NS_DECL_ISUPPORTS |
|
223 |
+ NS_DECL_NSISYSTEMPROXYSETTINGS |
|
224 |
+ |
|
225 |
+ nsUnixSystemProxySettings() {} |
|
226 |
+ nsresult Init(); |
|
227 |
+ |
|
228 |
+private: |
|
229 |
+ ~nsUnixSystemProxySettings() { |
|
230 |
+ if (mProxyFactory) |
|
231 |
+ px_proxy_factory_free(mProxyFactory); |
|
232 |
+ } |
|
233 |
+ |
|
234 |
+ pxProxyFactory *mProxyFactory; |
|
235 |
+ nsCOMPtr<nsIIOService> mIOService; |
|
236 |
+}; |
|
237 |
+ |
|
238 |
+NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings) |
|
239 |
+ |
|
240 |
+nsresult |
|
241 |
+nsUnixSystemProxySettings::Init() |
|
242 |
+{ |
|
243 |
+ mProxyFactory = nsnull; |
|
244 |
+ return NS_OK; |
|
245 |
+} |
|
246 |
+ |
|
247 |
+nsresult |
|
248 |
+nsUnixSystemProxySettings::GetPACURI(nsACString& aResult) |
|
249 |
+{ |
|
250 |
+ // Make sure we return an empty result. |
|
251 |
+ aResult.Truncate(); |
|
252 |
+ return NS_OK; |
|
253 |
+} |
|
254 |
+ |
|
255 |
+nsresult |
|
256 |
+nsUnixSystemProxySettings::GetProxyForURI(nsIURI* aURI, nsACString& aResult) |
|
257 |
+{ |
|
258 |
+ nsresult rv; |
|
259 |
+ |
|
260 |
+ if (!mProxyFactory) { |
|
261 |
+ mProxyFactory = px_proxy_factory_new(); |
|
262 |
+ } |
|
263 |
+ NS_ENSURE_TRUE(mProxyFactory, NS_ERROR_OUT_OF_MEMORY); |
|
264 |
+ |
|
265 |
+ if (!mIOService) { |
|
266 |
+ mIOService = do_GetIOService(); |
|
267 |
+ } |
|
268 |
+ NS_ENSURE_TRUE(mIOService, NS_ERROR_FAILURE); |
|
269 |
+ |
|
270 |
+ nsCAutoString spec; |
|
271 |
+ rv = aURI->GetSpec(spec); |
|
272 |
+ NS_ENSURE_SUCCESS(rv, rv); |
|
273 |
+ |
|
274 |
+ char **proxyArray = nsnull; |
|
275 |
+ proxyArray = px_proxy_factory_get_proxies(mProxyFactory, (char*)(spec.get())); |
|
276 |
+ NS_ENSURE_TRUE(proxyArray, NS_ERROR_FAILURE); |
|
277 |
+ |
|
278 |
+ // PAC string accepts |
|
279 |
+ // http, proxy, socks, socks4, socks5, direct, unknown |
|
280 |
+ // example: "PROXY proxy1.foo.com:8080; PROXY proxy2.foo.com:8080; DIRECT" |
|
281 |
+ int c = 0; |
|
282 |
+ while (proxyArray[c] != NULL) { |
|
283 |
+ if (c != 0) { |
|
284 |
+ aResult.AppendLiteral("; "); |
|
285 |
+ } |
|
286 |
+ |
|
287 |
+ PRBool isScheme = PR_FALSE; |
|
288 |
+ nsXPIDLCString schemeString; |
|
289 |
+ nsXPIDLCString hostPortString; |
|
290 |
+ nsCOMPtr<nsIURI> proxyURI; |
|
291 |
+ |
|
292 |
+ rv = mIOService->NewURI(nsDependentCString(proxyArray[c]), |
|
293 |
+ nsnull, |
|
294 |
+ nsnull, |
|
295 |
+ getter_AddRefs(proxyURI)); |
|
296 |
+ NS_ENSURE_SUCCESS(rv, rv); |
|
297 |
+ |
|
298 |
+ proxyURI->GetScheme(schemeString); |
|
299 |
+ if (NS_SUCCEEDED(proxyURI->SchemeIs("http", &isScheme)) && isScheme) { |
|
300 |
+ schemeString.AssignLiteral("proxy"); |
|
301 |
+ } |
|
302 |
+ aResult.Append(schemeString); |
|
303 |
+ if (NS_SUCCEEDED(proxyURI->SchemeIs("direct", &isScheme)) && !isScheme) { |
|
304 |
+ // Add the proxy URI only if it's not DIRECT |
|
305 |
+ proxyURI->GetHostPort(hostPortString); |
|
306 |
+ aResult.AppendLiteral(" "); |
|
307 |
+ aResult.Append(hostPortString); |
|
308 |
+ } |
|
309 |
+ |
|
310 |
+ c++; |
|
311 |
+ } |
|
312 |
+ |
|
74
053863c0cba8
Remove debug output for now (bnc#604711)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
59
diff
changeset
|
313 |
+//printf("returned PAC proxy string: %s\n", PromiseFlatCString(aResult).get()); |
0 | 314 |
+ |
315 |
+ PR_Free(proxyArray); |
|
316 |
+ return NS_OK; |
|
317 |
+} |
|
318 |
+ |
|
319 |
+#define NS_UNIXSYSTEMPROXYSERVICE_CID /* 0fa3158c-d5a7-43de-9181-a285e74cf1d4 */\ |
|
320 |
+ { 0x0fa3158c, 0xd5a7, 0x43de, \ |
|
321 |
+ {0x91, 0x81, 0xa2, 0x85, 0xe7, 0x4c, 0xf1, 0xd4 } } |
|
322 |
+ |
|
323 |
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUnixSystemProxySettings, Init) |
|
94
7177cac23915
Update to snapshot 20100707
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
324 |
+NS_DEFINE_NAMED_CID(NS_UNIXSYSTEMPROXYSERVICE_CID); |
0 | 325 |
+ |
94
7177cac23915
Update to snapshot 20100707
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
326 |
+static const mozilla::Module::CIDEntry kUnixProxyCIDs[] = { |
7177cac23915
Update to snapshot 20100707
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
327 |
+ { &kNS_UNIXSYSTEMPROXYSERVICE_CID, false, NULL, nsUnixSystemProxySettingsConstructor }, |
7177cac23915
Update to snapshot 20100707
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
328 |
+ { NULL } |
0 | 329 |
+}; |
330 |
+ |
|
94
7177cac23915
Update to snapshot 20100707
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
331 |
+static const mozilla::Module::ContractIDEntry kUnixProxyContracts[] = { |
7177cac23915
Update to snapshot 20100707
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
332 |
+ { NS_SYSTEMPROXYSETTINGS_CONTRACTID, &kNS_UNIXSYSTEMPROXYSERVICE_CID }, |
7177cac23915
Update to snapshot 20100707
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
333 |
+ { NULL } |
7177cac23915
Update to snapshot 20100707
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
334 |
+}; |
7177cac23915
Update to snapshot 20100707
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
335 |
+ |
7177cac23915
Update to snapshot 20100707
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
336 |
+static const mozilla::Module kUnixProxyModule = { |
7177cac23915
Update to snapshot 20100707
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
337 |
+ mozilla::Module::kVersion, |
7177cac23915
Update to snapshot 20100707
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
338 |
+ kUnixProxyCIDs, |
7177cac23915
Update to snapshot 20100707
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
339 |
+ kUnixProxyContracts |
7177cac23915
Update to snapshot 20100707
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
340 |
+}; |
7177cac23915
Update to snapshot 20100707
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
341 |
+ |
7177cac23915
Update to snapshot 20100707
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
342 |
+NSMODULE_DEFN(nsUnixProxyModule) = &kUnixProxyModule; |
7177cac23915
Update to snapshot 20100707
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
77
diff
changeset
|
343 |
+ |