summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz@4325f9fc-e183-4c21-96ce-0ab188b42d13 <louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13>2010-06-13 14:09:50 +0000
committerlouiz@4325f9fc-e183-4c21-96ce-0ab188b42d13 <louiz@4325f9fc-e183-4c21-96ce-0ab188b42d13>2010-06-13 14:09:50 +0000
commitb723a94efc19f1af7ecd14bb3d94ceb9e646a169 (patch)
tree1f5b6e1f6994d6a222a5e61ad07f154e02890913
parent9a1743f695b95a71c974ad8c7af178ab0dc3d130 (diff)
downloadpoezio-b723a94efc19f1af7ecd14bb3d94ceb9e646a169.tar.gz
poezio-b723a94efc19f1af7ecd14bb3d94ceb9e646a169.tar.bz2
poezio-b723a94efc19f1af7ecd14bb3d94ceb9e646a169.tar.xz
poezio-b723a94efc19f1af7ecd14bb3d94ceb9e646a169.zip
/me now is sent like a normal message
-rw-r--r--src/connection.py5
-rw-r--r--src/gui.py2
2 files changed, 2 insertions, 5 deletions
diff --git a/src/connection.py b/src/connection.py
index e20aaab5..d7b1ac6a 100644
--- a/src/connection.py
+++ b/src/connection.py
@@ -102,10 +102,7 @@ class Connection(threading.Thread):
self.client.auth(None, "", self.resource)
return True
except TypeError:
- self.handler.emit('error', msg=_('Error: Could not \
- authenticate. Please make sure the server you chose \
- (%s) supports anonymous authentication'
- % (config.get('server', ''))))
+ self.handler.emit('error', msg=_('Error: Could not authenticate. Please make sure the server you chose (%s) supports anonymous authentication' % (config.get('server', ''))))
return False
else:
password = config.get('password', '')
diff --git a/src/gui.py b/src/gui.py
index b127abb5..efb11166 100644
--- a/src/gui.py
+++ b/src/gui.py
@@ -507,7 +507,7 @@ class Gui(object):
self.window.input.refresh()
if line == "":
return
- if line.startswith('/'):
+ if line.startswith('/') and not line.startswith('/me '):
command = line.strip()[:].split()[0][1:]
args = line.strip()[:].split()[1:]
if command in self.commands.keys():