Working on pixelated-user-agent.

- Startup works till all mails are queried

1 files changed, 14 insertions, 5 deletions

diff --git a/service/pixelated/config/services.py b/service/pixelated/config/services.py
index d5489479..62b2f8ef 100644
--- a/service/pixelated/config/services.py
+++ b/service/pixelated/config/services.py
@@ -12,10 +12,14 @@ from twisted.internet import defer
 class Services(object):
 
     def __init__(self, leap_home, leap_session):
+        pass
+
+    @defer.inlineCallbacks
+    def setup(self, leap_home, leap_session):
 
         soledad_querier = SoledadQuerier(soledad=leap_session.soledad_session.soledad)
 
-        self.setup_search_engine(
+        yield self.setup_search_engine(
             leap_home,
             soledad_querier)
 
@@ -23,8 +27,9 @@ class Services(object):
             leap_session.account,
             soledad_querier,
             self.search_engine)
+        yield pixelated_mailboxes.index_mailboxes()
 
-        self.mail_service = self.setup_mail_service(
+        self.mail_service = yield self.setup_mail_service(
             leap_session,
             soledad_querier,
             self.search_engine,
@@ -35,6 +40,8 @@ class Services(object):
 
         self.post_setup(soledad_querier, leap_session)
 
+
+
     def post_setup(self, soledad_querier, leap_session):
         self.search_engine.index_mails(
             mails=self.mail_service.all_mails(),
@@ -52,16 +59,18 @@ class Services(object):
         MailboxIndexerListener.SEARCH_ENGINE = search_engine
         self.search_engine = search_engine
 
+    @defer.inlineCallbacks
     def setup_mail_service(self, leap_session, soledad_querier, search_engine, pixelated_mailboxes):
-        pixelated_mailboxes.add_welcome_mail_for_fresh_user()
+        if False:   # FIXME
+            yield pixelated_mailboxes.add_welcome_mail_for_fresh_user()
         pixelated_mail_sender = MailSender(
             leap_session.account_email(),
             leap_session.smtp)
-        return MailService(
+        defer.returnValue(MailService(
             pixelated_mailboxes,
             pixelated_mail_sender,
             soledad_querier,
-            search_engine)
+            search_engine))
 
     def setup_draft_service(self, pixelated_mailboxes):
         return DraftService(pixelated_mailboxes)