summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2011-09-25 15:31:12 +0200
committerFlorent Le Coz <louiz@louiz.org>2011-09-25 15:31:12 +0200
commitb5ce85869b12c1a0c8a9cf781f3d1dd989443355 (patch)
tree7238f999a5ee246f49ca73b688035f5253de6cbd
parent5ac6b7f8dc65f3e6e8f559c2b2ed08998d025f19 (diff)
downloadpoezio-b5ce85869b12c1a0c8a9cf781f3d1dd989443355.tar.gz
poezio-b5ce85869b12c1a0c8a9cf781f3d1dd989443355.tar.bz2
poezio-b5ce85869b12c1a0c8a9cf781f3d1dd989443355.tar.xz
poezio-b5ce85869b12c1a0c8a9cf781f3d1dd989443355.zip
Forgot that…
-rw-r--r--src/core.py2
-rw-r--r--src/windows.py9
2 files changed, 8 insertions, 3 deletions
diff --git a/src/core.py b/src/core.py
index 5e2566ff..b93678ab 100644
--- a/src/core.py
+++ b/src/core.py
@@ -390,7 +390,7 @@ class Core(object):
if time.time() - self.connection_time > 12:
# We do not display messages if we recently logged in
self.information("\x193}%s \x195}is \x194}online\x195} (\x190}%s\x195})" % (resource.get_jid().bare, status), "Roster")
- self.add_information_message_to_conversation_tab(jid.bare, '\x195%s is \x194}online' % (jid.bare))
+ self.add_information_message_to_conversation_tab(jid.bare, '\x195}%s is \x194}online' % (jid.bare))
contact.add_resource(resource)
def add_information_message_to_conversation_tab(self, jid, msg):
diff --git a/src/windows.py b/src/windows.py
index 2352a82a..1bfe49db 100644
--- a/src/windows.py
+++ b/src/windows.py
@@ -137,8 +137,13 @@ class Win(object):
self._win.attron(curses.A_BOLD)
if attr_char in string.digits and attr_char != '':
color_str = text[next_attr_char+1:text.find('}', next_attr_char)]
- self._win.attron(to_curses_attr((int(color_str), -1)))
- text = text[next_attr_char+len(color_str)+2:]
+ try:
+ self._win.attron(to_curses_attr((int(color_str), -1)))
+ except:
+ self._win.attron(to_curses_attr((-1, -1)))
+ text = text[next_attr_char+1+2:]
+ else:
+ text = text[next_attr_char+len(color_str)+2:]
else:
text = text[next_attr_char+2:]
next_attr_char = text.find('\x19')