summaryrefslogtreecommitdiff
path: root/docs/reference/Makefile.am
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2009-03-09 23:35:25 +0000
committerDan Winship <danw@src.gnome.org>2009-03-09 23:35:25 +0000
commita9b0e0a071825ec0b29d9bc09cc9770c419b8481 (patch)
treea622da7030437c438c9e1b8f5673eb53c8d8044e /docs/reference/Makefile.am
parent777915733e447d61afd05e80555d900bb74e6dd2 (diff)
downloadlibsoup-a9b0e0a071825ec0b29d9bc09cc9770c419b8481.tar.gz
Bug 571527 – gvfsd-http crashed with SIGSEGV in
g_hash_table_lookup(). As currently written, libproxy's gnome plugin causes intermittent gvfsd-http crashes, and I didn't have time to come up with either a fix or a workaround. So for 2.26.0 we will fall back to using the GConf-based proxy resolver. Hopefully to be fixed for 2.26.1. * configure.in: require both gconf and libproxy if building --with-gnome * libsoup/soup-proxy-resolver-gconf.c: bring this back. * libsoup/soup-gnome-features.c (soup_proxy_resolver_gnome_get_type): use gconf instead of libproxy * libsoup/Makefile.am: updates svn path=/trunk/; revision=1247
Diffstat (limited to 'docs/reference/Makefile.am')
-rw-r--r--docs/reference/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 0f22d4ae..cd067dc7 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -35,7 +35,8 @@ IGNORE_HFILES= soup.h soup-marshal.h soup-enum-types.h \
soup-connection.h soup-connection-ntlm.h \
soup-dns.h soup-auth-manager.h soup-auth-manager-ntlm.h \
soup-message-queue.h soup-path-map.h soup-ssl.h \
- soup-proxy-resolver-libproxy.h soup-proxy-resolver-static.h
+ soup-proxy-resolver-libproxy.h soup-proxy-resolver-gconf.h \
+ soup-proxy-resolver-static.h
# Images to copy into HTML directory.
HTML_IMAGES =