(trunk libT) tweak the peer-io bugfix

diff --git a/configure.ac b/configure.ac
index de78b6d25c6a5d79d8e942f3918f49fd4501c462..9920fd484eec19d48b6649e55a81f0e9435013f4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -192,7 +192,7 @@ dnl because "make dist" needs its Makefiles to exist, and
 dnl AM_CONDITIONAL + AC_CONFIG_SUBDIRS don't seem to play nice
 AC_CONFIG_SUBDIRS([third-party/libevent])
 libevent_source=bundled
-AC_CHECK_LIB([event],[evbuffer_readln],
+AC_CHECK_LIB([event],[evutil_vsnprintf],
              [libevent_found=yes],
              [libevent_found=no],
              [$libevent_extra_libs])

diff --git a/libtransmission/peer-io.c b/libtransmission/peer-io.c
index 363e039fe5a3b23bd09dfaa9d5c9c8ceb4a3c44f..3f1fd89b9650fe71451ecc190a59403cad85b458 100644 (file)
--- a/libtransmission/peer-io.c
+++ b/libtransmission/peer-io.c
@@ -530,7 +530,7 @@ io_dtor( void * vio )
     assert( io->session->events != NULL );
 
     dbgmsg( io, "in tr_peerIo destructor" );
-    event_disable( io, ~0 );
+    event_disable( io, EV_READ | EV_WRITE );
     tr_bandwidthDestruct( &io->bandwidth );
     evbuffer_free( io->outbuf );
     evbuffer_free( io->inbuf );
@@ -634,7 +634,7 @@ tr_peerIoReconnect( tr_peerIo * io )
     session = tr_peerIoGetSession( io );
 
     pendingEvents = io->pendingEvents;
-    event_disable( io, ~0 );
+    event_disable( io, EV_READ | EV_WRITE );
 
     if( io->socket >= 0 )
         tr_netClose( session, io->socket );