[Commits] (bkirsch) Updated to support new mail content model

[commits at osafoundation.org]

Commit by: bkirsch
Modified files:
chandler/parcels/osaf/views/main/Main.py 1.29 1.30

Log message:
Updated to support new mail content model

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

Index: chandler/parcels/osaf/views/main/Main.py
diff -u chandler/parcels/osaf/views/main/Main.py:1.29 chandler/parcels/osaf/views/main/Main.py:1.30
--- chandler/parcels/osaf/views/main/Main.py:1.29	Wed Aug 11 19:22:22 2004
+++ chandler/parcels/osaf/views/main/Main.py	Thu Aug 12 18:56:02 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.29 $"
-__date__ = "$Date: 2004/08/12 02:22:22 $"
+__version__ = "$Revision: 1.30 $"
+__date__ = "$Date: 2004/08/13 01:56:02 $"
 __copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -68,8 +68,8 @@
          "IMAP Account",
          account,
          [
-           { "attr":"serverName", "label":"IMAP Server" },
-           { "attr":"accountName", "label":"Username" },
+           { "attr":"host", "label":"IMAP Server" },
+           { "attr":"username", "label":"Username" },
            { "attr":"password", "label":"Password", "password":True },
          ]
         ):
@@ -83,8 +83,8 @@
                 # Retrieve the conflicting item
                 conflict = e.getItem()
                 itemPath = conflict.itsPath
-                serverName = conflict.serverName
-                accountName = conflict.accountName
+                host = conflict.host
+                username = conflict.username
                 password = conflict.password
                 print "Got a conflict with item:", itemPath
                 # The conflict item has *our* values in it; to see the
@@ -97,8 +97,8 @@
                 account = Globals.repository.findPath(itemPath)
                 # To resolve this conflict we're going to simply reapply the 
                 # values that were set in the dialog box.
-                account.serverName = serverName
-                account.accountName = accountName
+                account.host = host
+                account.username = username
                 account.password = password
                 Globals.repository.commit()
                 # Note: this commit, too, could get a conflict I suppose, so