diff options
| author | Dan Winship <danw@src.gnome.org> | 2009-02-02 17:28:46 +0000 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2009-02-02 17:28:46 +0000 |
| commit | 87d7645a3b3b46a31977d17237f04060caf123d6 (patch) | |
| tree | 570a41c64fb443b579afca275cbdbc568392ae40 /libsoup/soup-gnome-features.c | |
| parent | 2c3134c14a9eee2916e53eda3f99ef40065fc1cd (diff) | |
| download | libsoup-87d7645a3b3b46a31977d17237f04060caf123d6.tar.gz | |
Remove this, as it was incomplete, and libproxy is now officially a
* libsoup/soup-proxy-resolver-gconf.h:
* libsoup/soup-proxy-resolver-gconf.c: Remove this, as it was
incomplete, and libproxy is now officially a dependency of GNOME.
* libsoup/Makefile.am:
* libsoup/soup-gnome-features.c: remove gconf-vs-libproxy ifdefs
* configure.in: Remove GConf checks, require libproxy if building
libsoup-gnome.
svn path=/trunk/; revision=1233
Diffstat (limited to 'libsoup/soup-gnome-features.c')
| -rw-r--r-- | libsoup/soup-gnome-features.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libsoup/soup-gnome-features.c b/libsoup/soup-gnome-features.c index d25410c6..3d562c04 100644 --- a/libsoup/soup-gnome-features.c +++ b/libsoup/soup-gnome-features.c @@ -11,11 +11,7 @@ #include "soup-gnome-features.h" -#ifdef HAVE_LIBPROXY #include "soup-proxy-resolver-libproxy.h" -#else -#include "soup-proxy-resolver-gconf.h" -#endif /** * SOUP_TYPE_PROXY_RESOLVER_GNOME: @@ -32,19 +28,15 @@ GType soup_proxy_resolver_gnome_get_type (void) { -#ifdef HAVE_LIBPROXY return SOUP_TYPE_PROXY_RESOLVER_LIBPROXY; -#else - return SOUP_TYPE_PROXY_RESOLVER_GCONF; -#endif } /** * SOUP_TYPE_GNOME_FEATURES_2_26: * * This returns the #GType of a #SoupSessionFeature that automatically - * adds all of the GNOME features defined for libsoup 2.26. At the - * moment, this is just %SOUP_TYPE_PROXY_RESOLVER_GNOME. + * adds all of the GNOME features defined for libsoup 2.26 (which is + * just %SOUP_TYPE_PROXY_RESOLVER_GNOME). * * You can add this to a session using * soup_session_add_feature_by_type() or by using the |