summaryrefslogtreecommitdiff
path: root/src/room.py
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2011-05-04 23:08:58 +0200
committerFlorent Le Coz <louiz@louiz.org>2011-05-04 23:08:58 +0200
commit118a81992dd7ea8ef34eeac565d092f0e5191eb1 (patch)
tree5237d5b1fd8de67b80f7d0739fd9691fc38d51ac /src/room.py
parentc784deea9c6a3a2d19a6bfe56d2eae92e9c901f5 (diff)
downloadpoezio-118a81992dd7ea8ef34eeac565d092f0e5191eb1.tar.gz
poezio-118a81992dd7ea8ef34eeac565d092f0e5191eb1.tar.bz2
poezio-118a81992dd7ea8ef34eeac565d092f0e5191eb1.tar.xz
poezio-118a81992dd7ea8ef34eeac565d092f0e5191eb1.zip
Fix /recolor correctly, and also fixes #2158
Diffstat (limited to 'src/room.py')
-rw-r--r--src/room.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/room.py b/src/room.py
index 4bb6b8b1..3ff655fb 100644
--- a/src/room.py
+++ b/src/room.py
@@ -60,7 +60,8 @@ class Room(TextBuffer):
color = None
if not time and nickname and nickname != self.own_nick and self.joined:
if self.own_nick.lower() in txt.lower():
- self.set_color_state(theme.COLOR_TAB_HIGHLIGHT)
+ if self.color_state != theme.COLOR_TAB_CURRENT:
+ self.set_color_state(theme.COLOR_TAB_HIGHLIGHT)
color = theme.COLOR_HIGHLIGHT_NICK
else:
highlight_words = config.get('highlight_on', '').split(':')
@@ -105,7 +106,7 @@ class Room(TextBuffer):
self.color_state != theme.COLOR_TAB_CURRENT:
if self.color_state != theme.COLOR_TAB_HIGHLIGHT:
self.set_color_state(theme.COLOR_TAB_NEW_MESSAGE)
- nick_color = nick_color or user.color if user else None
+ nick_color = nick_color or None
if not nickname or time:
txt = '\x195%s' % (txt,)
else: # TODO