From cfcd8175455cb49a46dab376a139751b01531e8f Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Wed, 12 Dec 2012 17:59:12 +0000 Subject: [PATCH] merged fix from RC_0_16 --- ChangeLog | 1 + bindings/python/src/session.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 0ffad6c69..b02141aaf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * fix uTP edge case where udp socket buffer fills up * fix nagle implementation in uTP + * make get_settings available in the python binding regardless of deprecated functions * fix typo in python settings binding * fix possible dangling pointer use in peer list * fix support for storing arbitrary data in the DHT diff --git a/bindings/python/src/session.cpp b/bindings/python/src/session.cpp index d14547395..21e312f5b 100644 --- a/bindings/python/src/session.cpp +++ b/bindings/python/src/session.cpp @@ -600,6 +600,7 @@ void bind_session() .def("get_settings", &session_get_settings) #else .def("settings", &session_get_settings) + .def("get_settings", &session_get_settings) #endif .def("set_settings", &session_set_settings) #ifndef TORRENT_DISABLE_ENCRYPTION