[Commits] (donn) Fix problem sending mail (bug 1868)

[commits at osafoundation.org]

Commit by: donn
Modified files:
chandler/parcels/osaf/contentmodel/mail/Mail.py 1.26 1.27
chandler/parcels/osaf/contentmodel/ContentModel.py 1.32 1.33
chandler/parcels/osaf/views/main/Main.py 1.54 1.55

Log message:
Fix problem sending mail (bug 1868)
------------------------------------
* Calling setStatusMessage() instead of setStatusText()

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/contentmodel/mail/Mail.py.diff?r1=text&tr1=1.26&r2=text&tr2=1.27
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/contentmodel/ContentModel.py.diff?r1=text&tr1=1.32&r2=text&tr2=1.33
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/views/main/Main.py.diff?r1=text&tr1=1.54&r2=text&tr2=1.55

Index: chandler/parcels/osaf/contentmodel/mail/Mail.py
diff -u chandler/parcels/osaf/contentmodel/mail/Mail.py:1.26 chandler/parcels/osaf/contentmodel/mail/Mail.py:1.27
--- chandler/parcels/osaf/contentmodel/mail/Mail.py:1.26	Fri Sep 10 14:36:46 2004
+++ chandler/parcels/osaf/contentmodel/mail/Mail.py	Fri Sep 10 16:24:09 2004
@@ -1,8 +1,8 @@
 """ Classes used for Mail parcel kinds
 """
 
-__revision__  = "$Revision: 1.26 $"
-__date__      = "$Date: 2004/09/10 21:36:46 $"
+__revision__  = "$Revision: 1.27 $"
+__date__      = "$Date: 2004/09/10 23:24:09 $"
 __copyright__ = "Copyright (c) 2003-2004 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -425,7 +425,7 @@
         DLDTBD - move to MailMessageMixin
         """
         # put a "committing" message into the status bar
-        self.setStatusText ('Committing changes...')
+        self.setStatusMessage ('Committing changes...')
 
         # commit changes, since we'll be switching to Twisted thread
         Globals.repository.commit()
@@ -434,7 +434,7 @@
         account = self.defaultSMTPAccount ()
 
         # put a sending message into the status bar
-        self.setStatusText ('Sending mail...')
+        self.setStatusMessage ('Sending mail...')
 
         # Now send the mail
         import osaf.mail.smtp as smtp

Index: chandler/parcels/osaf/contentmodel/ContentModel.py
diff -u chandler/parcels/osaf/contentmodel/ContentModel.py:1.32 chandler/parcels/osaf/contentmodel/ContentModel.py:1.33
--- chandler/parcels/osaf/contentmodel/ContentModel.py:1.32	Wed Sep  8 23:21:26 2004
+++ chandler/parcels/osaf/contentmodel/ContentModel.py	Fri Sep 10 16:24:10 2004
@@ -1,8 +1,8 @@
 """ Classes used for contentmodel parcel and kinds.
 """
 
-__revision__  = "$Revision: 1.32 $"
-__date__      = "$Date: 2004/09/09 06:21:26 $"
+__revision__  = "$Revision: 1.33 $"
+__date__      = "$Date: 2004/09/10 23:24:10 $"
 __copyright__ = "Copyright (c) 2003-2004 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -11,7 +11,7 @@
 import repository.item.Item as Item
 import repository.item.Query as Query
 import repository.persistence.XMLRepositoryView as XMLRepositoryView
-from mx import DateTime
+import mx.DateTime as DateTime
 import logging
 
 import application.Globals as Globals
@@ -536,9 +536,9 @@
         import mail.Mail as Mail
         return Mail.EmailAddress.getCurrentMeEmailAddress ()
 
-    def setStatusText (cls, message):
-        Globals.mainView.setStatusText (message)
-    setStatusText = classmethod (setStatusText)
+    def setStatusMessage (cls, message, *args):
+        Globals.mainView.setStatusMessage (message, *args)
+    setStatusMessage = classmethod (setStatusMessage)
 
 class Project(Item.Item):
     def __init__(self, name=None, parent=None, kind=None):

Index: chandler/parcels/osaf/views/main/Main.py
diff -u chandler/parcels/osaf/views/main/Main.py:1.54 chandler/parcels/osaf/views/main/Main.py:1.55
--- chandler/parcels/osaf/views/main/Main.py:1.54	Thu Sep  9 13:24:19 2004
+++ chandler/parcels/osaf/views/main/Main.py	Fri Sep 10 16:24:10 2004
@@ -1,5 +1,5 @@
-__version__ = "$Revision: 1.54 $"
-__date__ = "$Date: 2004/09/09 20:24:19 $"
+__version__ = "$Revision: 1.55 $"
+__date__ = "$Date: 2004/09/10 23:24:10 $"
 __copyright__ = "Copyright (c) 2004 Open Source Applications Foundation"
 __license__ = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -431,7 +431,7 @@
           Called when the SMTP Send was successful.
         """
         if mailMessage is not None and mailMessage.isOutbound:
-            self.setStatusMessage (_('mailMessage "%s" sent.') % mailMessage.about)
+            self.setStatusMessage (_('Mail "%s" sent.') % mailMessage.about)
 
     def displaySMTPSendError (self, mailMessage):
         """