Merge branch 'master' into xirvik

configure.ac

@@ -1,6 +1,6 @@
 AC_INIT(rtorrent, 0.8.9, jaris@ifi.uio.no)
 
-AC_DEFINE(API_VERSION, 4, api version)
+AC_DEFINE(API_VERSION, 5, api version)
 
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)

rak/error_number.h

@@ -51,6 +51,7 @@ public:
   static const int e_deadlk      = EDEADLK;
 
   static const int e_noent       = ENOENT;
+  static const int e_nodev       = ENODEV;
   static const int e_nomem       = ENOMEM;
   static const int e_notdir      = ENOTDIR;
   static const int e_isdir       = EISDIR;

src/command_throttle.cc

@@ -162,6 +162,13 @@ apply_address_throttle(const torrent::Object::list_type& args) {
   return torrent::Object();
 }
 
+torrent::Object
+throttle_update() {
+  control->ui()->adjust_up_throttle(0);
+  control->ui()->adjust_down_throttle(0);
+  return torrent::Object();
+}
+
 void
 initialize_command_throttle() {
   CMD2_ANY         ("throttle.unchoked_uploads",   tr1::bind(&torrent::ResourceManager::currently_upload_unchoked, torrent::resource_manager()));
@@ -182,6 +189,8 @@ initialize_command_throttle() {
   CMD2_VAR_VALUE   ("throttle.max_downloads.div",    1);
   CMD2_VAR_VALUE   ("throttle.max_downloads.global", 0);
 
+  CMD2_ANY         ("throttle.update",                      tr1::bind(&throttle_update));
+
   // TODO: Move the logic into some libtorrent function.
   CMD2_ANY         ("throttle.global_up.rate",              tr1::bind(&torrent::Rate::rate, torrent::up_rate()));
   CMD2_ANY         ("throttle.global_up.total",             tr1::bind(&torrent::Rate::total, torrent::up_rate()));

src/core/download.cc

@@ -36,9 +36,7 @@
 
 #include "config.h"
 
-#include <sigc++/adaptors/bind.h>
-#include <sigc++/adaptors/hide.h>
-#include <sigc++/signal.h>
+#include <list>
 #include <rak/file_stat.h>
 #include <rak/functional.h>
 #include <rak/path.h>

src/core/download.h

@@ -37,7 +37,6 @@
 #ifndef RTORRENT_CORE_DOWNLOAD_H
 #define RTORRENT_CORE_DOWNLOAD_H
 
-#include <sigc++/connection.h>
 #include <torrent/download.h>
 #include <torrent/download_info.h>
 #include <torrent/hash_string.h>