From fd80ed75fe1a2db90dbf2bf4504daba65e3650bf Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Sat, 5 Nov 2016 15:49:39 +0000
Subject: [PATCH] [#2922] Fix proxy settings and torrent status for lt 1.1

---
 deluge/core/preferencesmanager.py | 28 ++++++++++++++++------------
 deluge/core/torrent.py            |  2 +-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/deluge/core/preferencesmanager.py b/deluge/core/preferencesmanager.py
index 619f9d89d..088d7e410 100644
--- a/deluge/core/preferencesmanager.py
+++ b/deluge/core/preferencesmanager.py
@@ -391,19 +391,23 @@ class PreferencesManager(component.Component):
 
     def _on_set_proxy(self, key, value):
         try:
-            if key == 'i2p_proxy':
-                self.session.apply_settings('proxy_type', lt.proxy_type('i2p_proxy'))
-                self.session.apply_settings('i2p_hostname', value['hostname'])
-                self.session.apply_settings('i2p_port', value['port'])
+            if key == 'i2p_proxy' or value['type'] == 6:
+                proxy_settings = {
+                    'proxy_type': lt.proxy_type.i2p_proxy,
+                    'i2p_hostname': value['hostname'],
+                    'i2p_port': value['port']
+                }
             else:
-                self.session.apply_settings('proxy_type', lt.proxy_type(value['type']))
-                self.session.apply_settings('proxy_hostname', value['hostname'])
-                self.session.apply_settings('proxy_port', value['port'])
-                self.session.apply_settings('proxy_username', value['username'])
-                self.session.apply_settings('proxy_password', value['password'])
-                self.session.apply_settings('proxy_hostnames', value['proxy_hostnames'])
-                self.session.apply_settings('proxy_peer_connections', value['proxy_peer_connections'])
-                self.session.apply_settings('proxy_tracker_connections', value['proxy_tracker_connections'])
+                proxy_settings = {
+                    'proxy_type': value['type'],
+                    'proxy_hostname': value['hostname'],
+                    'proxy_port': value['port'],
+                    'proxy_username': value['username'],
+                    'proxy_password': value['password'],
+                    'proxy_hostnames': value['proxy_hostnames'],
+                    'proxy_peer_connections': value['proxy_peer_connections'],
+                }
+            self.session.apply_settings(proxy_settings)
         except AttributeError:
             proxy_settings = lt.proxy_settings()
             proxy_settings.hostname = value['hostname']
diff --git a/deluge/core/torrent.py b/deluge/core/torrent.py
index 5b5ceab80..3b5a9a1fc 100644
--- a/deluge/core/torrent.py
+++ b/deluge/core/torrent.py
@@ -624,7 +624,7 @@ class Torrent(object):
         old_state = self.state
         self.set_status_message()
         try:
-            status_error = status.errc
+            status_error = status.errc.message() if status.errc.value() else ''
         except AttributeError:
             # Deprecated in libtorrent 1.1
             status_error = status.error