david/jcl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Does not execute feeder if account is disabled

Browse Source 
darcs-hash:20070928165648-86b55-b3197bbefd64549689241e40fd0f73361f1cc595.gz
This commit is contained in:
David Rousselie
2007-09-28 18:56:48 +02:00
parent 5e61fd6710
commit 51f63ace3a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/jcl/jabber/component.py
View File

@@ -724,7 +724,8 @@ class AccountManager(object):
for _account in account.get_accounts(user_jid): for _account in account.get_accounts(user_jid):
result.extend(self.remove_account(_account, user_jid, False)) result.extend(self.remove_account(_account, user_jid, False))
user = account.get_user(unicode(user_jid.bare())) 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, result.append(Presence(from_jid=self.component.jid,
to_jid=user_jid, to_jid=user_jid,
stanza_type="unsubscribe")) stanza_type="unsubscribe"))

5
src/jcl/jabber/feeder.py
View File

@@ -33,7 +33,6 @@ from jcl.jabber.component import JCLComponent
from jcl.lang import Lang from jcl.lang import Lang
import jcl.model as model import jcl.model as model
from jcl.model import account from jcl.model import account
from jcl.model.account import Account
from pyxmpp.message import Message from pyxmpp.message import Message
@@ -152,8 +151,8 @@ class FeederHandler(Handler):
Do nothing by default. Do nothing by default.
""" """
for _account in data: 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) self.sender.send(_account, data)
return [] return []