summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui.py3
-rw-r--r--src/keyboard.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/gui.py b/src/gui.py
index 87fd517d..7207a7a4 100644
--- a/src/gui.py
+++ b/src/gui.py
@@ -1072,12 +1072,13 @@ class Gui(object):
room = self.current_room()
if room.name == "Info" or room.jid is not None:
return
+ r = None
for user in room.users:
if user.nick == nick:
r = self.open_private_window(room.name, user.nick)
if r and len(args) > 1:
msg = arg[len(nick)+1:]
- muc.send_private_message(r.name, msg)
+ muc.send_private_message(self.xmpp, r.name, msg)
self.add_message_to_room(r, msg, None, r.own_nick)
def command_topic(self, arg):
diff --git a/src/keyboard.py b/src/keyboard.py
index 265fa00b..6b6c43f7 100644
--- a/src/keyboard.py
+++ b/src/keyboard.py
@@ -51,6 +51,8 @@ def read_char(s):
return "^"+chr(first + 64)
if first == 27:
(first, c) = get_next_byte(s)
+ if not isinstance(first, int): # Keyboard special, like KEY_HOME etc
+ return char
return "M-"+chr(first)
if 194 <= first:
(code, c) = get_next_byte(s) # 2 bytes char