diff options
| -rw-r--r-- | src/gui.py | 5 | ||||
| -rw-r--r-- | src/window.py | 12 |
2 files changed, 13 insertions, 4 deletions
@@ -359,7 +359,10 @@ class Gui(object): body = stanza.getBody() subject = stanza.getSubject() if subject: - info = room.add_info(_("%(nick)s changed the subject to: %(subject)s") % {'nick':nick_from, 'subject':subject}) + if nick_from: + info = room.add_info(_("%(nick)s changed the subject to: %(subject)s") % {'nick':nick_from, 'subject':subject}) + else: + info = room.add_info(_("The subject is: %(subject)s") % {'subject':subject}) self.window.text_win.add_line(room, (datetime.now(), info)) room.topic = subject.encode('utf-8').replace('\n', '|') if room == self.current_room(): diff --git a/src/window.py b/src/window.py index 8ad1fc78..167c4b87 100644 --- a/src/window.py +++ b/src/window.py @@ -179,9 +179,17 @@ class TextWin(object): return win = self.wins[room.name].win users = room.users + win.addstr('\n['+line[0].strftime("%H")) + win.attron(curses.color_pair(9)) + win.addstr(':') + win.attroff(curses.color_pair(9)) + win.addstr(line[0].strftime('%M')) + win.attron(curses.color_pair(9)) + win.addstr(':') + win.attroff(curses.color_pair(9)) + win.addstr(line[0].strftime('%S') + "] ") if len(line) == 2: try: - win.addstr('\n['+line[0].strftime("%H:%M:%S") + "] ") win.attron(curses.color_pair(8)) win.addstr(line[1]) win.attroff(curses.color_pair(8)) @@ -191,8 +199,6 @@ class TextWin(object): if user.nick == line[1]: break try: - try:win.addstr('\n['+line[0].strftime("%H:%M:%S") + "] <") - except:pass length = len('['+line[0].strftime("%H:%M:%S") + "] <") if line[1]: win.attron(curses.color_pair(user.color)) |