From 18f161e4a687353f1c888d25fb1b8c3de8ee284d Mon Sep 17 00:00:00 2001
From: "louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13"
<louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13>
Date: Sun, 31 Jan 2010 15:59:37 +0000
Subject: corrige un bug dans la liste de contacts (saloperie d'utf-8)
---
src/gui.py | 10 ++++++----
src/window.py | 4 +++-
2 files changed, 9 insertions(+), 5 deletions(-)
(limited to 'src')
diff --git a/src/gui.py b/src/gui.py
index 6b557575..2b2845df 100644
--- a/src/gui.py
+++ b/src/gui.py
@@ -84,7 +84,7 @@ class Room(object):
return info.encode('utf-8')
except: # I JUST FUCKING HATE THIS .encode.decode.shit !!!
self.lines.append((datetime.now(), info))
- return info
+ return info.encode('utf-8')
def get_user_by_name(self, nick):
for user in self.users:
@@ -104,7 +104,7 @@ class Room(object):
if nick.encode('utf-8') == self.own_nick:
self.joined = True
return self.add_info(_("Your nickname is %s") % (nick))
- return self.add_info(_("%s is in the room") % (nick))
+ return self.add_info(_("%s is in the room") % (nick.encode-('utf-8')))
change_nick = stanza.getStatusCode() == '303'
kick = stanza.getStatusCode() == '307'
user = self.get_user_by_name(nick)
@@ -322,7 +322,10 @@ class Gui(object):
else:
msg = room.on_presence(stanza, from_nick)
if room == self.current_room():
- self.window.text_win.add_line(room, (datetime.now(), msg))
+ try:
+ self.window.text_win.add_line(room, (datetime.now(), msg))
+ except:
+ pass
self.window.text_win.refresh(room.name)
self.window.user_win.refresh(room.users)
self.window.text_win.refresh()
@@ -362,7 +365,6 @@ class Gui(object):
msg = self.commands[args[0]][1]
else:
msg = _('Unknown command: %s') % args[0]
-# open('fion', 'w').write(msg)
room.add_info(msg)
self.window.text_win.add_line(room, (datetime.now(), msg))
self.window.text_win.refresh(room.name)
diff --git a/src/window.py b/src/window.py
index ac6c928d..0d42a88b 100644
--- a/src/window.py
+++ b/src/window.py
@@ -55,9 +55,11 @@ class UserList(Win):
except:
color = 1
self.win.attron(curses.color_pair(color))
- self.win.addstr(y, 1, user.nick)
+ self.win.addnstr(y, 1, user.nick, self.width-1)
self.win.attroff(curses.color_pair(color))
y += 1
+ if y == self.height:
+ break
self.win.refresh()
def resize(self, height, width, y, x, stdscr):
--
cgit v1.2.3