summaryrefslogtreecommitdiff
path: root/src/core.py
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2011-11-06 19:24:37 +0100
committerFlorent Le Coz <louiz@louiz.org>2011-11-06 19:24:37 +0100
commit6a0ac419c5c1d259171a5d49e323f23cd181462c (patch)
tree1c18c4bb890cd9b2ea425bdc67c4feff52f9e99c /src/core.py
parent07f9fab401f34753d0619ebb8d65f6f9df97931d (diff)
parent0315b05f5122f1f4697699fc09de1b0860203177 (diff)
downloadpoezio-6a0ac419c5c1d259171a5d49e323f23cd181462c.tar.gz
poezio-6a0ac419c5c1d259171a5d49e323f23cd181462c.tar.bz2
poezio-6a0ac419c5c1d259171a5d49e323f23cd181462c.tar.xz
poezio-6a0ac419c5c1d259171a5d49e323f23cd181462c.zip
Merge branch 'master' into plugins
Diffstat (limited to 'src/core.py')
-rw-r--r--src/core.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core.py b/src/core.py
index d9d0b00e..aab82768 100644
--- a/src/core.py
+++ b/src/core.py
@@ -617,7 +617,7 @@ class Core(object):
if not body:
return
tab.add_message(body, time=None, nickname=nick_from,
- forced_user=self.get_tab_by_name(room_from, tabs.MucTab).get_user_by_name(nick_from))
+ forced_user=self.get_tab_by_name(room_from, tabs.MucTab).get_user_by_name(nick_from))
conversation = self.get_tab_by_name(jid.full, tabs.PrivateTab)
if conversation and conversation.remote_wants_chatstates is None:
if message['chat_state']: