summaryrefslogtreecommitdiff
path: root/src/room.py
diff options
context:
space:
mode:
authorlouiz@4325f9fc-e183-4c21-96ce-0ab188b42d13 <louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13>2010-08-10 23:28:00 +0000
committerlouiz@4325f9fc-e183-4c21-96ce-0ab188b42d13 <louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13>2010-08-10 23:28:00 +0000
commit9ad62d4466cb1f1566be503d7a7ff8657e330673 (patch)
tree1e8882b91cb3e130cd6e2f664da289b6231f8da6 /src/room.py
parentfc99b9e8625af9ec2916ed641de0dc3b093a7cea (diff)
downloadpoezio-9ad62d4466cb1f1566be503d7a7ff8657e330673.tar.gz
poezio-9ad62d4466cb1f1566be503d7a7ff8657e330673.tar.bz2
poezio-9ad62d4466cb1f1566be503d7a7ff8657e330673.tar.xz
poezio-9ad62d4466cb1f1566be503d7a7ff8657e330673.zip
Fix Link Mauve completion bug
Diffstat (limited to 'src/room.py')
-rw-r--r--src/room.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/room.py b/src/room.py
index 28e29b76..63003229 100644
--- a/src/room.py
+++ b/src/room.py
@@ -69,7 +69,7 @@ class Room(object):
Set the tab color and returns the txt color
"""
color = None
- if not time and nickname.encode('utf-8') != self.own_nick and self.joined and nickname is not None: # do the highlight
+ if not time and nickname and nickname.encode('utf-8') != self.own_nick and self.joined: # do the highlight
try:
if self.own_nick in txt.encode('utf-8'):
self.set_color_state(common.ROOM_STATE_HL)
@@ -101,12 +101,12 @@ class Room(object):
if user:
user.set_last_talked(datetime.now())
color = None
- if not time and nickname is not None and\
+ if not time and nickname and\
nickname != self.own_nick and\
self.color_state != common.ROOM_STATE_CURRENT:
- if not self.jid:
+ if not self.jid and self.color_state != common.ROOM_STATE_HL:
self.set_color_state(common.ROOM_STATE_MESSAGE)
- else:
+ elif self.jid:
self.set_color_state(common.ROOM_STATE_PRIVATE)
if not nickname:
color = 8