Merge branch 'master' into develop

This commit is contained in:
Lance Stout
2012-08-10 14:15:55 -07:00
6 changed files with 44 additions and 18 deletions

View File

@@ -156,6 +156,7 @@ class XEP_0045(BasePlugin):
entry = pr['muc'].getStanzaValues()
entry['show'] = pr['show']
entry['status'] = pr['status']
entry['alt_nick'] = pr['nick']
if pr['type'] == 'unavailable':
if entry['nick'] in self.rooms[entry['room']]:
del self.rooms[entry['room']][entry['nick']]