From ab69ae3fe6523e50fc1a5dea27718e31d39a987c Mon Sep 17 00:00:00 2001 From: rakshasa Date: Fri, 11 Mar 2005 01:01:39 +0000 Subject: [PATCH] Cleanup. git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@341 e378c898-3ddf-0310-93e7-cc216c733640 --- src/core/download.cc | 2 +- src/core/manager.cc | 2 +- src/display/utils.cc | 4 ++-- src/display/window_tracker_list.cc | 3 ++- src/main.cc | 4 ++++ 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/core/download.cc b/src/core/download.cc index 1d480113..a1535249 100644 --- a/src/core/download.cc +++ b/src/core/download.cc @@ -12,7 +12,7 @@ void Download::set_download(torrent::Download d) { m_download = d; - m_connTrackerSucceded = m_download.signal_tracker_succeded(sigc::hide(sigc::bind(sigc::mem_fun(*this, &Download::receive_tracker_msg), ""))); + m_connTrackerSucceded = m_download.signal_tracker_succeded(sigc::bind(sigc::mem_fun(*this, &Download::receive_tracker_msg), "")); m_connTrackerFailed = m_download.signal_tracker_failed(sigc::mem_fun(*this, &Download::receive_tracker_msg)); } diff --git a/src/core/manager.cc b/src/core/manager.cc index a5e821de..4ebfbf39 100644 --- a/src/core/manager.cc +++ b/src/core/manager.cc @@ -141,7 +141,7 @@ Manager::create_final(std::istream* s) { m_downloadStore.save(*itr); if (m_debugTracker >= 0) - (*itr)->get_download().signal_tracker_succeded(sigc::mem_fun(*this, &Manager::receive_debug_tracker)); + (*itr)->get_download().signal_tracker_dump(sigc::mem_fun(*this, &Manager::receive_debug_tracker)); return itr; } diff --git a/src/display/utils.cc b/src/display/utils.cc index 28e23e89..20f8c8ad 100644 --- a/src/display/utils.cc +++ b/src/display/utils.cc @@ -22,10 +22,10 @@ print_download_status(core::Download* d) { str << "Inactive"; } else if (!d->get_tracker_msg().empty()) { - str << "Tracker: " << d->get_tracker_msg(); + str << "Tracker: [" << d->get_tracker_msg() << ']'; } else { - str << "---"; + //str << "---"; } return str.str(); diff --git a/src/display/window_tracker_list.cc b/src/display/window_tracker_list.cc index aff450ce..5bd20b52 100644 --- a/src/display/window_tracker_list.cc +++ b/src/display/window_tracker_list.cc @@ -43,8 +43,9 @@ WindowTrackerList::redraw() { while (range.first != range.second) { torrent::Tracker t = m_download->get_download().get_tracker(range.first); - m_canvas->print(0, pos, "%c %s", + m_canvas->print(0, pos, "%c %2i %s", range.first == *m_focus ? '*' : ' ', + t.get_group(), t.get_url().c_str()); ++range.first; diff --git a/src/main.cc b/src/main.cc index f7248360..9966c0df 100644 --- a/src/main.cc +++ b/src/main.cc @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -113,6 +114,9 @@ main(int argc, char** argv) { utils::Timer::update(); + srandom(utils::Timer::cache().usec()); + srand48(utils::Timer::cache().usec()); + try { SignalHandler::set_handler(SIGINT, sigc::bind(sigc::mem_fun(uiRoot, &ui::Root::set_shutdown_received), true));