Update of /cvsroot/mahogany/M/src/adb
In directory usw-pr-cvs1:/tmp/cvs-serv13167/src/adb
Modified Files:
AdbEntry.cpp
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.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/AdbEntry.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -2 -r1.7 -r1.8
--- AdbEntry.cpp 14 Apr 2002 09:03:57 -0000 1.7
+++ AdbEntry.cpp 26 Apr 2002 13:15:06 -0000 1.8
@@ -29,4 +29,6 @@
#include "adb/AdbEntry.h"
+#include "Address.h"
+
// ============================================================================
// implementation
@@ -34,4 +36,21 @@
// ----------------------------------------------------------------------------
+// AdbEntry
+// ----------------------------------------------------------------------------
+
+String AdbEntry::GetDescription() const
+{
+ String name = GetField(AdbField_FullName),
+ address = GetField(AdbField_EMail);
+
+ // 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 Address::BuildFullForm(name, address);
+}
+
+// ----------------------------------------------------------------------------
// AdbEntryCommon class
// ----------------------------------------------------------------------------
@@ -155,2 +174,3 @@
return 0;
}
+
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
