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

replace SSL by TLS for SMTPAccount

Browse Source 
darcs-hash:20070617121908-86b55-77447f0143679aa73a5eb3a6aa1f1290e2dd2aa5.gz
This commit is contained in:
David Rousselie
2007-06-17 14:19:08 +02:00
parent afb9d6c525
commit d6b91f8d02
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/jmc/lang.py
View File

@@ -34,6 +34,7 @@ class Lang(jcl.lang.Lang):
field_host = u"Host" field_host = u"Host"
field_port = u"Port" field_port = u"Port"
field_ssl = u"Secure connection (SSL)" field_ssl = u"Secure connection (SSL)"
field_tls = u"Secure connection (TLS)"
field_store_password = u"Store password on Jabber server?" field_store_password = u"Store password on Jabber server?"
field_live_email_only = u"Reports only emails received while connected to Jabber" field_live_email_only = u"Reports only emails received while connected to Jabber"
field_interval = u"Mail check interval (in minutes)" field_interval = u"Mail check interval (in minutes)"
@@ -82,6 +83,7 @@ class Lang(jcl.lang.Lang):
field_host = u"Adresse du serveur email" field_host = u"Adresse du serveur email"
field_port = u"Port du serveur email" field_port = u"Port du serveur email"
field_ssl = u"Connexion sécurisé (SSL)" field_ssl = u"Connexion sécurisé (SSL)"
field_tls = u"Connexion sécurisé (TLS)"
field_store_password = u"Sauvegarder le mot de passe sur le serveur Jabber ?" field_store_password = u"Sauvegarder le mot de passe sur le serveur Jabber ?"
field_live_email_only = u"Vérifier les nouveaux emails seulement " \ field_live_email_only = u"Vérifier les nouveaux emails seulement " \
"lorsqu'une session Jabber est ouverte" "lorsqu'une session Jabber est ouverte"

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

@@ -544,7 +544,7 @@ class SMTPAccount(Account):
password = StringCol(default=None) password = StringCol(default=None)
host = StringCol(default="localhost") host = StringCol(default="localhost")
port = IntCol(default=110) port = IntCol(default=110)
ssl = BoolCol(default=False) tls = BoolCol(default=False)
store_password = BoolCol(default=True) store_password = BoolCol(default=True)
waiting_password_reply = BoolCol(default=False) waiting_password_reply = BoolCol(default=False)
default_from = StringCol(default="nobody@localhost") default_from = StringCol(default="nobody@localhost")
@@ -615,7 +615,7 @@ class SMTPAccount(Account):
("port", "text-single", None, ("port", "text-single", None,
account.int_post_func, account.int_post_func,
lambda bare_from_jid: real_class.get_default_port()), lambda bare_from_jid: real_class.get_default_port()),
("ssl", "boolean", None, ("tls", "boolean", None,
account.default_post_func, account.default_post_func,
lambda bare_from_jid: False), lambda bare_from_jid: False),
("default_from", "text-single", None, ("default_from", "text-single", None,

1
src/jmc/tests/lang.py
View File

@@ -81,6 +81,7 @@ class Language_TestCase(jcl.tests.lang.Language_TestCase):
self.assertNotEquals(self.lang_class.field_host, None) self.assertNotEquals(self.lang_class.field_host, None)
self.assertNotEquals(self.lang_class.field_port, None) self.assertNotEquals(self.lang_class.field_port, None)
self.assertNotEquals(self.lang_class.field_ssl, None) self.assertNotEquals(self.lang_class.field_ssl, None)
self.assertNotEquals(self.lang_class.field_tls, None)
self.assertNotEquals(self.lang_class.field_store_password, None) self.assertNotEquals(self.lang_class.field_store_password, None)
self.assertNotEquals(self.lang_class.field_live_email_only, None) self.assertNotEquals(self.lang_class.field_live_email_only, None)
self.assertNotEquals(self.lang_class.field_interval, None) self.assertNotEquals(self.lang_class.field_interval, None)