From 974973be469b33e2a5c623b5d4ea7da74df8ea94 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Thu, 18 Nov 2004 17:10:59 +0000 Subject: [PATCH] two bugfixes in jabber.py --- common/jabber.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/jabber.py b/common/jabber.py index f71776fff..dac9c52bb 100644 --- a/common/jabber.py +++ b/common/jabber.py @@ -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,