From 51f63ace3a9e249b5bc862b5c7b71d61ad9ea04f Mon Sep 17 00:00:00 2001 From: David Rousselie Date: Fri, 28 Sep 2007 18:56:48 +0200 Subject: [PATCH] Does not execute feeder if account is disabled darcs-hash:20070928165648-86b55-b3197bbefd64549689241e40fd0f73361f1cc595.gz --- src/jcl/jabber/component.py | 3 ++- src/jcl/jabber/feeder.py | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/jcl/jabber/component.py b/src/jcl/jabber/component.py index b009d77..e38822c 100644 --- a/src/jcl/jabber/component.py +++ b/src/jcl/jabber/component.py @@ -724,7 +724,8 @@ class AccountManager(object): for _account in account.get_accounts(user_jid): result.extend(self.remove_account(_account, user_jid, False)) user = account.get_user(unicode(user_jid.bare())) - user.destroySelf() + if user is not None: + user.destroySelf() result.append(Presence(from_jid=self.component.jid, to_jid=user_jid, stanza_type="unsubscribe")) diff --git a/src/jcl/jabber/feeder.py b/src/jcl/jabber/feeder.py index 93b2cf4..9bcbce1 100644 --- a/src/jcl/jabber/feeder.py +++ b/src/jcl/jabber/feeder.py @@ -33,7 +33,6 @@ from jcl.jabber.component import JCLComponent from jcl.lang import Lang import jcl.model as model from jcl.model import account -from jcl.model.account import Account from pyxmpp.message import Message @@ -152,8 +151,8 @@ class FeederHandler(Handler): Do nothing by default. """ for _account in data: - for data in self.feeder.feed(_account): - if _account.enabled: + if _account.enabled: + for data in self.feeder.feed(_account): self.sender.send(_account, data) return []