Merge tag 'upstream/1.4.6'

Upstream version 1.4.6

2 files changed, 16 insertions, 5 deletions

diff --git a/NEWS b/NEWS
index 1fda04e..02b45aa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+1.4.6  2012-12-13
+    - Support for Transmission version 2.75
+
+
 1.4.5  2012-11-07
     BUGFIXES:
         - Fix forwarding CLI args to transmission-remote
diff --git a/transmission-remote-cli b/transmission-remote-cli
index 668faff..d874a48 100755
--- a/transmission-remote-cli
+++ b/transmission-remote-cli
@@ -16,10 +16,10 @@
 # http://www.gnu.org/licenses/gpl-3.0.txt                              #
 ########################################################################
 
-VERSION = '1.4.5'
+VERSION = '1.4.6'
 
 TRNSM_VERSION_MIN = '1.90'
-TRNSM_VERSION_MAX = '2.73'
+TRNSM_VERSION_MAX = '2.75'
 RPC_VERSION_MIN = 8
 RPC_VERSION_MAX = 14
 
@@ -155,9 +155,16 @@ class ColorManager:
         # has something to do with how highlighting focus works.)
         bg_name = pair.split(',')[1].split(':')[1].upper()
         fg_name = pair.split(',')[0].split(':')[1].upper()
-        return { 'id': len(self.config.keys()) + 1,
-                 'bg': eval('curses.COLOR_' + bg_name),
-                 'fg': eval('curses.COLOR_' + fg_name) }
+        color_pair = { 'id': len(self.config.keys()) + 1 }
+        try:
+            color_pair['bg'] = eval('curses.COLOR_' + bg_name)
+        except AttributeError:
+            color_pair['bg'] = -1
+        try:
+            color_pair['fg'] = eval('curses.COLOR_' + fg_name)
+        except AttributeError:
+            color_pair['fg'] = -1
+        return color_pair
 
     def id(self, name): return self.config[name]['id']