Mercurial > audlegacy-plugins
changeset 1910:7f9d2bb96441
Automated merge with ssh://sidhe.atheme.org//hg/audacious-plugins
| author | Jonathan Schleifer <js@h3c.de> |
|---|---|
| date | Thu, 27 Sep 2007 22:10:35 +0200 |
| parents | 81b524aa7fcd (current diff) b37cea7ef4a9 (diff) |
| children | c123420debd7 |
| files | configure.ac |
| diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Thu Sep 27 22:09:51 2007 +0200 +++ b/configure.ac Thu Sep 27 22:10:35 2007 +0200 @@ -1285,7 +1285,7 @@ [have_neon=no]) if test "x$have_neon" = "xyes"; then - PKG_CHECK_MODULES(NEON, [neon >= 0.27], [TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS neon" ], [have_neon="no"]) + PKG_CHECK_MODULES(NEON, [neon >= 0.26], [TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS neon" ], [have_neon="no"]) NEON_LIBS=`pkg-config --libs neon` NEON_CFLAGS=`pkg-config --cflags neon` else
--- a/src/neon/neon.c Thu Sep 27 22:09:51 2007 +0200 +++ b/src/neon/neon.c Thu Sep 27 22:10:35 2007 +0200 @@ -53,6 +53,11 @@ neon_vfs_metadata_impl }; +/* bring ne_set_connect_timeout in as a weak reference, not using it + * unless we have it available (neon 0.27) --nenolod + */ +extern void ne_set_connect_timeout(ne_session *sess, int timeout) __attribute__ ((weak)); + /* * ======== */ @@ -565,7 +570,10 @@ ne_add_server_auth(handle->session, NE_AUTH_BASIC, server_auth_callback, (void *)handle); ne_set_session_flag(handle->session, NE_SESSFLAG_ICYPROTO, 1); ne_set_session_flag(handle->session, NE_SESSFLAG_PERSIST, 0); - ne_set_connect_timeout(handle->session, 10); + + if (ne_set_connect_timeout != NULL) + ne_set_connect_timeout(handle->session, 10); + ne_set_read_timeout(handle->session, 10); ne_set_useragent(handle->session, "Audacious/1.4.0"); ne_redirect_register(handle->session);