diff options
| author | Dan Winship <danw@src.gnome.org> | 2009-03-09 23:35:25 +0000 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2009-03-09 23:35:25 +0000 |
| commit | a9b0e0a071825ec0b29d9bc09cc9770c419b8481 (patch) | |
| tree | a622da7030437c438c9e1b8f5673eb53c8d8044e /libsoup/soup-gnome-features.c | |
| parent | 777915733e447d61afd05e80555d900bb74e6dd2 (diff) | |
| download | libsoup-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 'libsoup/soup-gnome-features.c')
| -rw-r--r-- | libsoup/soup-gnome-features.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libsoup/soup-gnome-features.c b/libsoup/soup-gnome-features.c index 2a85e8c9..549af391 100644 --- a/libsoup/soup-gnome-features.c +++ b/libsoup/soup-gnome-features.c @@ -11,7 +11,7 @@ #include "soup-gnome-features.h" -#include "soup-proxy-resolver-libproxy.h" +#include "soup-proxy-resolver-gconf.h" /** * SOUP_TYPE_PROXY_RESOLVER_GNOME: @@ -19,7 +19,7 @@ * This returns the #GType of a #SoupProxyResolver that can be used to * resolve HTTP proxies for GNOME applications. You can add this to * a session using soup_session_add_feature_by_type() or by using the - * %SOUP_SESSION_ADD_FEATURE_BY_TIME construct-time property. + * %SOUP_SESSION_ADD_FEATURE_BY_TYPE construct-time property. * * This feature is included in %SOUP_TYPE_GNOME_FEATURES_2_26, so if * you are using that feature, you do not need to include this feature @@ -30,7 +30,7 @@ GType soup_proxy_resolver_gnome_get_type (void) { - return SOUP_TYPE_PROXY_RESOLVER_LIBPROXY; + return SOUP_TYPE_PROXY_RESOLVER_GCONF; } /** |