From 7680277eeeea5b7d70ae0c64e0edaf951c244f18 Mon Sep 17 00:00:00 2001 From: rakshasa Date: Sat, 13 Aug 2011 09:38:26 +0000 Subject: [PATCH] * Moving over some cosmetic changes from a patchset. git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@1269 e378c898-3ddf-0310-93e7-cc216c733640 --- src/command_groups.cc | 2 +- src/core/download_list.cc | 4 ++-- src/main.cc | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/command_groups.cc b/src/command_groups.cc index 2bb41aba..8f753e51 100644 --- a/src/command_groups.cc +++ b/src/command_groups.cc @@ -90,7 +90,7 @@ cg_d_group(core::Download* download) { const std::string& cg_d_group_name(core::Download* download) { - return torrent::resource_manager()->group_at(torrent::resource_manager()->entry_at(download->main()).group()).name(); + return torrent::resource_manager()->group_at(torrent::resource_manager()->entry_at(download->main()).group())->name(); } void diff --git a/src/core/download_list.cc b/src/core/download_list.cc index d2af0716..e7bbbb32 100644 --- a/src/core/download_list.cc +++ b/src/core/download_list.cc @@ -178,8 +178,8 @@ DownloadList::insert(Download* download) { iterator itr = base_type::insert(end(), download); try { - (*itr)->info()->signal_download_done().connect(sigc::bind(sigc::mem_fun(*this, &DownloadList::received_finished), download)); - (*itr)->info()->signal_initial_hash().connect(sigc::bind(sigc::mem_fun(*this, &DownloadList::hash_done), download)); + (*itr)->data()->slot_initial_hash() = std::bind(&DownloadList::hash_done, this, download); + (*itr)->data()->slot_download_done() = std::bind(&DownloadList::received_finished, this, download); // This needs to be separated into two different calls to ensure // the download remains in the view. diff --git a/src/main.cc b/src/main.cc index 42dbf73a..9bb53e33 100644 --- a/src/main.cc +++ b/src/main.cc @@ -246,7 +246,8 @@ main(int argc, char** argv) { "method.set_key = event.download.erased, !_download_list, ui.unfocus_download=\n" "method.set_key = event.download.erased, ~_delete_tied, d.delete_tied=\n" - "method.set_key = event.download.finished, !_timestamp, ((d.timestamp.finished.set, ((system.time)) ))\n" + "method.set_key = event.download.resumed, !_timestamp, ((d.timestamp.started.set_if_z, ((system.time)) ))\n" + "method.set_key = event.download.finished, !_timestamp, ((d.timestamp.finished.set_if_z, ((system.time)) ))\n" "method.insert.c_simple = group.insert_persistent_view," "((view.add,((argument.0)))),((view.persistent,((argument.0)))),((group.insert,((argument.0)),((argument.0))))\n"