summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins
diff options
context:
space:
mode:
authorTom Nichols <tmnichols@gmail.com>2010-05-13 13:48:27 -0400
committerTom Nichols <tmnichols@gmail.com>2010-05-13 13:48:27 -0400
commit341c110b6ad0922cb47494e493fe8075e00cad65 (patch)
tree7d07a4166213ee1e8d067d6daee0185b96533005 /sleekxmpp/plugins
parenta92075a659866f611e7eefca6bf92b56272e48bd (diff)
parent7522839141e7dd5bd081a421a58b0962b705fdda (diff)
downloadslixmpp-341c110b6ad0922cb47494e493fe8075e00cad65.tar.gz
slixmpp-341c110b6ad0922cb47494e493fe8075e00cad65.tar.bz2
slixmpp-341c110b6ad0922cb47494e493fe8075e00cad65.tar.xz
slixmpp-341c110b6ad0922cb47494e493fe8075e00cad65.zip
Merge branch 'master' of git@github.com:tomstrummer/SleekXMPP into hacks
Diffstat (limited to 'sleekxmpp/plugins')
-rw-r--r--sleekxmpp/plugins/xep_0045.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/plugins/xep_0045.py b/sleekxmpp/plugins/xep_0045.py
index 240e6b9a..937c6f96 100644
--- a/sleekxmpp/plugins/xep_0045.py
+++ b/sleekxmpp/plugins/xep_0045.py
@@ -93,10 +93,10 @@ class MUCPresence(ElementBase):
return self
def getNick(self):
- return self.parent['from'].resource
+ return self.parent()['from'].resource
def getRoom(self):
- return self.parent['from'].bare
+ return self.parent()['from'].bare
def setNick(self, value):
logging.warning("Cannot set nick through mucpresence plugin.")