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

Update code to match JCL refactoring

Browse Source 
darcs-hash:20070724054515-86b55-48f3e4236c2963a4ea2e79117e31fc2d34bae302.gz
This commit is contained in:
David Rousselie
2007-07-24 07:45:15 +02:00
parent 721a33d5d5
commit e88ceb87f8
2 changed files with 32 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/jmc/jabber/component.py
View File

@@ -22,18 +22,12 @@
## ##
import logging import logging
import re
import sys
from sqlobject import *
from pyxmpp.message import Message
from pyxmpp.jid import JID from pyxmpp.jid import JID
import jcl.jabber as jabber import jcl.jabber as jabber
from jcl.model.account import Account, PresenceAccount, LegacyJID from jcl.model.account import PresenceAccount
from jcl.jabber.disco import RootDiscoGetInfoHandler from jcl.jabber.disco import RootDiscoGetInfoHandler
from jcl.jabber.component import Handler, AccountManager
from jcl.jabber.feeder import FeederComponent, Feeder, MessageSender, \ from jcl.jabber.feeder import FeederComponent, Feeder, MessageSender, \
HeadlineSender, FeederHandler HeadlineSender, FeederHandler

12
src/jmc/model/account.py
View File

@@ -188,13 +188,13 @@ class MailAccount(PresenceAccount):
return PresenceAccount.get_register_fields(real_class) + \ return PresenceAccount.get_register_fields(real_class) + \
[("login", "text-single", None, [("login", "text-single", None,
lambda field_value, default_func, bare_from_jid: \ lambda field_value, default_func, bare_from_jid: \
account.mandatory_field(field_value), account.mandatory_field("login", field_value),
lambda bare_from_jid: ""), lambda bare_from_jid: ""),
("password", "text-private", None, password_post_func, ("password", "text-private", None, password_post_func,
lambda bare_from_jid: ""), lambda bare_from_jid: ""),
("host", "text-single", None, ("host", "text-single", None,
lambda field_value, default_func, bare_from_jid: \ lambda field_value, default_func, bare_from_jid: \
account.mandatory_field(field_value), account.mandatory_field("host", field_value),
lambda bare_from_jid: ""), lambda bare_from_jid: ""),
("port", "text-single", None, ("port", "text-single", None,
account.int_post_func, account.int_post_func,
@@ -461,6 +461,7 @@ class POP3Account(MailAccount):
def _init(self, *args, **kw): def _init(self, *args, **kw):
MailAccount._init(self, *args, **kw) MailAccount._init(self, *args, **kw)
self.__logger = logging.getLogger("jmc.model.account.POP3Account") self.__logger = logging.getLogger("jmc.model.account.POP3Account")
self.connected = False
def _get_default_port(cls): def _get_default_port(cls):
"""Return default POP3 server port""" """Return default POP3 server port"""
@@ -492,8 +493,7 @@ class POP3Account(MailAccount):
def disconnect(self): def disconnect(self):
self.__logger.debug("Disconnecting from POP3 server " self.__logger.debug("Disconnecting from POP3 server " + self.host)
+ self.host)
self.connection.quit() self.connection.quit()
self.connected = False self.connected = False
@@ -617,7 +617,7 @@ class SMTPAccount(Account):
lambda bare_from_jid: ""), lambda bare_from_jid: ""),
("host", "text-single", None, ("host", "text-single", None,
lambda field_value, default_func, bare_from_jid: \ lambda field_value, default_func, bare_from_jid: \
account.mandatory_field(field_value), account.mandatory_field("host", field_value),
lambda bare_from_jid: ""), lambda bare_from_jid: ""),
("port", "text-single", None, ("port", "text-single", None,
account.int_post_func, account.int_post_func,
@@ -627,7 +627,7 @@ class SMTPAccount(Account):
lambda bare_from_jid: False), lambda bare_from_jid: False),
("default_from", "text-single", None, ("default_from", "text-single", None,
lambda field_value, default_func, bare_from_jid: \ lambda field_value, default_func, bare_from_jid: \
account.mandatory_field(field_value), account.mandatory_field("default_from", field_value),
lambda bare_from_jid: ""), lambda bare_from_jid: ""),
("store_password", "boolean", None, ("store_password", "boolean", None,
account.default_post_func, account.default_post_func,