summaryrefslogtreecommitdiff
path: root/sleekxmpp/clientxmpp.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2010-10-26 23:47:17 -0400
committerLance Stout <lancestout@gmail.com>2010-10-26 23:47:17 -0400
commit65aa6573df3a8f298e7df96473014c19216971ef (patch)
treed9a40d480071bd5e1983f3de41aa1860be1baa98 /sleekxmpp/clientxmpp.py
parentb888610525a441dce622bf6132a4b3cab76a26b2 (diff)
downloadslixmpp-65aa6573df3a8f298e7df96473014c19216971ef.tar.gz
slixmpp-65aa6573df3a8f298e7df96473014c19216971ef.tar.bz2
slixmpp-65aa6573df3a8f298e7df96473014c19216971ef.tar.xz
slixmpp-65aa6573df3a8f298e7df96473014c19216971ef.zip
First pass at integrating the new roster manager.
Diffstat (limited to 'sleekxmpp/clientxmpp.py')
-rw-r--r--sleekxmpp/clientxmpp.py17
1 files changed, 8 insertions, 9 deletions
diff --git a/sleekxmpp/clientxmpp.py b/sleekxmpp/clientxmpp.py
index dc4d0e4a..4bf759ea 100644
--- a/sleekxmpp/clientxmpp.py
+++ b/sleekxmpp/clientxmpp.py
@@ -63,7 +63,7 @@ class ClientXMPP(BaseXMPP):
when calling register_plugins.
escape_quotes -- Deprecated.
"""
- BaseXMPP.__init__(self, 'jabber:client')
+ BaseXMPP.__init__(self, jid, 'jabber:client')
# To comply with PEP8, method names now use underscores.
# Deprecated method names are re-mapped for backwards compatibility.
@@ -72,7 +72,6 @@ class ClientXMPP(BaseXMPP):
self.getRoster = self.get_roster
self.registerFeature = self.register_feature
- self.set_jid(jid)
self.password = password
self.escape_quotes = escape_quotes
self.plugin_config = plugin_config
@@ -418,13 +417,13 @@ class ClientXMPP(BaseXMPP):
"""
if iq['type'] == 'set' or (iq['type'] == 'result' and request):
for jid in iq['roster']['items']:
- if not jid in self.roster:
- self.roster[jid] = {'groups': [],
- 'name': '',
- 'subscription': 'none',
- 'presence': {},
- 'in_roster': True}
- self.roster[jid].update(iq['roster']['items'][jid])
+ item = iq['roster']['items'][jid]
+ roster = self.rosters[iq['to'].bare]
+ roster[jid]['name'] = item['name']
+ roster[jid]['groups'] = item['groups']
+ roster[jid]['from'] = item['subscription'] in ['from', 'both']
+ roster[jid]['to'] = item['subscription'] in ['to', 'both']
+ roster[jid]['pending_out'] = (item['ask'] == 'subscribe')
self.event("roster_update", iq)
if iq['type'] == 'set':