[Commits] (morgen) The Sync toolbar button and File > Sync > All menu should skip mail if

[commits at osafoundation.org]

Commit by: morgen
Modified files:
chandler/parcels/osaf/views/main/Main.py 1.159 1.160

Log message:
The Sync toolbar button and File > Sync > All menu should skip mail if
IMAP account not set up


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/main/Main.py.diff?r1=text&tr1=1.159&r2=text&tr2=1.160

Index: chandler/parcels/osaf/views/main/Main.py
diff -u chandler/parcels/osaf/views/main/Main.py:1.159 chandler/parcels/osaf/views/main/Main.py:1.160
--- chandler/parcels/osaf/views/main/Main.py:1.159	Thu Apr 14 23:45:54 2005
+++ chandler/parcels/osaf/views/main/Main.py	Fri Apr 15 16:02:55 2005
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.159 $"
-__date__ = "$Date: 2005/04/15 06:45:54 $"
+__version__ = "$Revision: 1.160 $"
+__date__ = "$Date: 2005/04/15 23:02:55 $"
 __copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -619,14 +619,10 @@
         # find all the shared collections and sync them.
         self.onSyncWebDAVEvent (event)
 
-        # Make sure we have all the accounts; returns False if the user cancels
-        # out and we don't.
-        if not Sharing.ensureAccountSetUp(self.itsView):
-            return
-
-        # synch mail
-        self.setStatusMessage (_("Getting new Mail"))
-        self.onGetNewMailEvent (event)
+        # If mail is set up, fetch it:
+        if Sharing.isIMAPSetUp(self.itsView):
+            self.setStatusMessage (_("Getting new Mail"))
+            self.onGetNewMailEvent (event)
 
     def sharedWebDAVCollections (self):
         # return the list of all the shared collections