diff options
| author | Florent Le Coz <louiz@louiz.org> | 2011-10-29 07:20:10 +0200 |
|---|---|---|
| committer | Florent Le Coz <louiz@louiz.org> | 2011-10-29 07:20:10 +0200 |
| commit | 0451127ff8a1b96772b58ff9e246621d0df4c99e (patch) | |
| tree | 00a650ba6f909ee1977bedeb3001798f39a38a0a /src/core.py | |
| parent | b98880b5269764ad69bb19262790d27b2575b174 (diff) | |
| parent | aa6738800d67c5061d7e551b3d896f3366296045 (diff) | |
| download | poezio-0451127ff8a1b96772b58ff9e246621d0df4c99e.tar.gz poezio-0451127ff8a1b96772b58ff9e246621d0df4c99e.tar.bz2 poezio-0451127ff8a1b96772b58ff9e246621d0df4c99e.tar.xz poezio-0451127ff8a1b96772b58ff9e246621d0df4c99e.zip | |
Merge branch 'master' into plugins
Diffstat (limited to 'src/core.py')
| -rw-r--r-- | src/core.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core.py b/src/core.py index b39bf904..1fb06b38 100644 --- a/src/core.py +++ b/src/core.py @@ -350,7 +350,7 @@ class Core(object): """ When a data form is received """ - self.information('%s' % messsage) + self.information('%s' % message) def on_chatstate_active(self, message): self.on_chatstate(message, "active") @@ -1105,7 +1105,7 @@ class Core(object): nick_from = message['mucnick'] room_from = message.getMucroom() if message['type'] == 'error': # Check if it's an error - return self.room_error(message, from_room) + return self.room_error(message, room_from) room = self.get_room_by_name(room_from) tab = self.get_tab_by_name(room_from, tabs.MucTab) if tab and tab.get_room() and tab.get_room().get_user_by_name(nick_from) and\ @@ -1360,7 +1360,7 @@ class Core(object): """ /join [room][/nick] [password] """ - args = arg.split() + args = common.shell_split(arg) password = None if len(args) == 0: t = self.current_tab() |