diff options
| author | Gabriel Albo <gabriel@albo.com.br> | 2015-11-04 11:23:50 -0200 |
|---|---|---|
| committer | Gabriel Albo <gabriel@albo.com.br> | 2015-11-04 11:23:50 -0200 |
| commit | 742f6c87b0ff37154b1c2779c0f5a44fd899c34d (patch) | |
| tree | 763caa014955576b613c4114cb7962265b37e743 /service/pixelated/config/services.py | |
| parent | dccd63fcffe4a5b73282815514fdb0848a0468ed (diff) | |
| parent | d79aa00e3c24c5bf5e5ed5ba5a9b976f93034362 (diff) | |
Merge branch 'master' of github.com:pixelated-project/pixelated-user-agent
Diffstat (limited to 'service/pixelated/config/services.py')
| -rw-r--r-- | service/pixelated/config/services.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/service/pixelated/config/services.py b/service/pixelated/config/services.py index 41a357dc..cd475228 100644 --- a/service/pixelated/config/services.py +++ b/service/pixelated/config/services.py @@ -1,7 +1,7 @@ from pixelated.adapter.mailstore.searchable_mailstore import SearchableMailStore from pixelated.adapter.services.mail_service import MailService from pixelated.adapter.model.mail import InputMail -from pixelated.adapter.services.mail_sender import MailSender +from pixelated.adapter.services.mail_sender import LocalSmtpMailSender, MailSender # , MailSender from pixelated.adapter.search import SearchEngine from pixelated.adapter.services.draft_service import DraftService from pixelated.adapter.listeners.mailbox_indexer_listener import listen_all_mailboxes @@ -55,11 +55,12 @@ class Services(object): self.search_engine = search_engine def setup_mail_service(self, leap_session, search_engine): - # if False: FIXME - # yield pixelated_mailboxes.add_welcome_mail_for_fresh_user() - pixelated_mail_sender = MailSender( + pixelated_mail_sender = LocalSmtpMailSender( leap_session.account_email(), leap_session.smtp) + + MailSender(leap_session.smtp._smtp_config, leap_session.nicknym.keymanager) + return MailService( pixelated_mail_sender, leap_session.mail_store, |