Backed out changeset e811b4e21013

This commit is contained in:
Florent Le Coz 2011-09-25 15:32:00 +02:00
parent b5ce85869b
commit 0ee2194d3c
2 changed files with 3 additions and 8 deletions

View file

@ -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):

View file

@ -137,13 +137,8 @@ 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)]
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:]
self._win.attron(to_curses_attr((int(color_str), -1)))
text = text[next_attr_char+len(color_str)+2:]
else:
text = text[next_attr_char+2:]
next_attr_char = text.find('\x19')