Update of /cvsroot/mahogany/M/include/adb
In directory usw-pr-cvs1:/tmp/cvs-serv13167/include/adb
Modified Files:
AdbEntry.h
Log Message:
1. replaced GetFullEmailAddress() with (static) Address::BuildFullForm()
2. quote the personal part of the address correctly in it now
3. OTOH, don't do it in the composer: this fixes the bugs 633 and 486
Index: AdbEntry.h
===================================================================
RCS file: /cvsroot/mahogany/M/include/adb/AdbEntry.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -b -u -2 -r1.21 -r1.22
--- AdbEntry.h 16 Apr 2002 22:48:23 -0000 1.21
+++ AdbEntry.h 26 Apr 2002 13:15:05 -0000 1.22
@@ -148,4 +148,12 @@
virtual void GetEMail(size_t n, String *pstr) const = 0;
+ /// a more convenient wrapper around GetField() version above
+ String GetField(size_t n) const
+ {
+ String s;
+ GetField(n, &s);
+ return s;
+ }
+
// changing the data
/// set any text field with this function
@@ -168,24 +176,6 @@
/// description of an item is the name and the address
- virtual String GetDescription() const
- {
- String name, address;
- GetField(AdbField_FullName, &name);
- GetField(AdbField_EMail, &address);
-
- // the full form is "FullName <email>", but if the "fullname" is empty,
- // we take "nickname" instead (it can not be empty normally)
- if ( !name )
- GetField(AdbField_NickName, &name);
-
- return GetFullEmailAddress(name, address);
- }
-
- String GetField(size_t n) const
- {
- String s;
- GetField(n, &s);
- return s;
- }
+ /// return the full address, i.e. "personal-part <address-part>" string
+ virtual String GetDescription() const;
};
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
