two bugfixes in jabber.py

This commit is contained in:
Yann Leboulanger 2004-11-18 17:10:59 +00:00
parent c269731e2d
commit 974973be46
1 changed files with 2 additions and 2 deletions

View File

@ -343,7 +343,7 @@ class Connection(xmlstream.Client):
"""
if not type and not ns: type='default'
if not self.handlers[name].has_key(type+ns): self.handlers[name][type+ns]=[]
if makefirst: self.handlers[name][type+ns].insert({'chain':chained,'func':handler,'system':system})
if makefirst: self.handlers[name][type+ns].insert(0, {'chain':chained,'func':handler,'system':system})
else: self.handlers[name][type+ns].append({'chain':chained,'func':handler,'system':system})
def setDisconnectHandler(self, func):
@ -481,7 +481,7 @@ class Client(Connection):
groups.append(group.getData())
if jid:
if sub == 'remove' or sub == 'none':
if sub == 'remove' or (sub == 'none' and not ask):
self._roster._remove(jid)
else:
self._roster._set(jid=jid, name=name,