diff options
author | Brian Beggs <macdiesel@speakeasy.net> | 2010-05-14 10:59:41 -0400 |
---|---|---|
committer | Brian Beggs <macdiesel@speakeasy.net> | 2010-05-14 10:59:41 -0400 |
commit | 4b322720b39731d16fefedd8a77b3f9bb1684d7e (patch) | |
tree | 330e3a05f35675b0779060656156cefe320e27f2 /sleekxmpp/plugins | |
parent | 1521a8b5c9d656ef80a4caf3d7daa86f8f504423 (diff) | |
parent | 7522839141e7dd5bd081a421a58b0962b705fdda (diff) | |
download | slixmpp-4b322720b39731d16fefedd8a77b3f9bb1684d7e.tar.gz slixmpp-4b322720b39731d16fefedd8a77b3f9bb1684d7e.tar.bz2 slixmpp-4b322720b39731d16fefedd8a77b3f9bb1684d7e.tar.xz slixmpp-4b322720b39731d16fefedd8a77b3f9bb1684d7e.zip |
Merge remote branch 'tom/master'
Diffstat (limited to 'sleekxmpp/plugins')
-rw-r--r-- | sleekxmpp/plugins/xep_0045.py | 4 |
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.") |