[Commits] (donn) Display "me" with full emailAddress string

[commits at osafoundation.org]

Commit by: donn
Modified files:
chandler/parcels/osaf/contentmodel/mail/Mail.py 1.25 1.26

Log message:
Display "me" with full emailAddress string

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/chandler/parcels/osaf/contentmodel/mail/Mail.py.diff?r1=text&tr1=1.25&r2=text&tr2=1.26

Index: chandler/parcels/osaf/contentmodel/mail/Mail.py
diff -u chandler/parcels/osaf/contentmodel/mail/Mail.py:1.25 chandler/parcels/osaf/contentmodel/mail/Mail.py:1.26
--- chandler/parcels/osaf/contentmodel/mail/Mail.py:1.25	Wed Sep  8 23:21:26 2004
+++ chandler/parcels/osaf/contentmodel/mail/Mail.py	Fri Sep 10 14:36:46 2004
@@ -1,8 +1,8 @@
 """ Classes used for Mail parcel kinds
 """
 
-__revision__  = "$Revision: 1.25 $"
-__date__      = "$Date: 2004/09/09 06:21:26 $"
+__revision__  = "$Revision: 1.26 $"
+__date__      = "$Date: 2004/09/10 21:36:46 $"
 __copyright__ = "Copyright (c) 2003-2004 Open Source Applications Foundation"
 __license__   = "http://osafoundation.org/Chandler_0.1_license_terms.htm"
 
@@ -489,11 +489,12 @@
           User readable string version of this address
         """
         if self.emailAddress == self._getTheMeAddress():
-            return 'me'
-        try:
-            fullName = self.fullName
-        except AttributeError:
-            fullName = ''
+            fullName = 'me'
+        else:
+            try:
+                fullName = self.fullName
+            except AttributeError:
+                fullName = ''
         if fullName is not None and len (fullName) > 0:
             return fullName + ' <' + self.emailAddress + '>'
         else: