From 3ef8384c38ebba761499367f329af42c9b1fcac7 Mon Sep 17 00:00:00 2001 From: rakshasa Date: Fri, 16 Mar 2007 23:22:51 +0000 Subject: [PATCH] * Set allowed encodings for tracker and http requests. * Fixed two valgrind errors in the ChokeManager code. * Added 'seeding' view on key 8. Remeber to fix the man page. * Fixed an exception being thrown in ChokeManager::cycle(...) due to a missing range check on the number of unchokes we do. * Moved choke/queued state to a new ChokeManagerNode class. git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@869 e378c898-3ddf-0310-93e7-cc216c733640 --- src/core/curl_get.cc | 1 + src/main.cc | 6 ++++++ src/option_parser.h | 3 --- src/ui/element_download_list.cc | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/core/curl_get.cc b/src/core/curl_get.cc index d1c60b3b..eb5136db 100644 --- a/src/core/curl_get.cc +++ b/src/core/curl_get.cc @@ -82,6 +82,7 @@ CurlGet::start() { curl_easy_setopt(m_handle, CURLOPT_FOLLOWLOCATION, 1); curl_easy_setopt(m_handle, CURLOPT_MAXREDIRS, 5); curl_easy_setopt(m_handle, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); + curl_easy_setopt(m_handle, CURLOPT_ENCODING, ""); m_stack->add_get(this); } diff --git a/src/main.cc b/src/main.cc index 10670d65..0b0cc55b 100644 --- a/src/main.cc +++ b/src/main.cc @@ -206,6 +206,12 @@ main(int argc, char** argv) { "view_sort_new = hashing,state_changed\n" "view_sort_current = hashing,state_changed\n" + "view_add = seeding\n" + "view_filter = seeding,started,complete\n" + "view_filter_on = seeding,start,stop\n" + "view_sort_new = seeding,state_changed\n" + "view_sort_current = seeding,state_changed_reverse\n" + "schedule = view_main,10,10,view_sort=main,20\n" "schedule = view_name,10,10,view_sort=name,20\n" // "schedule = view_started,10,10,view_sort=started,5\n" diff --git a/src/option_parser.h b/src/option_parser.h index 9d313db5..d1fa8a7d 100644 --- a/src/option_parser.h +++ b/src/option_parser.h @@ -50,9 +50,6 @@ public: typedef sigc::slot2 SlotStringPair; typedef sigc::slot2 SlotIntPair; - OptionParser() {} - ~OptionParser() { m_container.clear(); } - void insert_flag(char c, Slot s); void insert_option(char c, SlotString s); void insert_option_list(char c, SlotStringPair s); diff --git a/src/ui/element_download_list.cc b/src/ui/element_download_list.cc index 9d2d3735..c9a66446 100644 --- a/src/ui/element_download_list.cc +++ b/src/ui/element_download_list.cc @@ -78,6 +78,7 @@ ElementDownloadList::ElementDownloadList() : m_bindings['5'] = sigc::bind(sigc::mem_fun(*this, &ElementDownloadList::receive_change_view), "complete"); m_bindings['6'] = sigc::bind(sigc::mem_fun(*this, &ElementDownloadList::receive_change_view), "incomplete"); m_bindings['7'] = sigc::bind(sigc::mem_fun(*this, &ElementDownloadList::receive_change_view), "hashing"); + m_bindings['8'] = sigc::bind(sigc::mem_fun(*this, &ElementDownloadList::receive_change_view), "seeding"); m_bindings[KEY_UP] = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementDownloadList::receive_prev); m_bindings[KEY_DOWN] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementDownloadList::receive_next);