* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 10 insertions, 2 deletions

diff --git a/plugins/kmail/bodypartformatter/attendeeselector.cpp b/plugins/kmail/bodypartformatter/attendeeselector.cpp
index 0ea917be..8fa67770 100644
--- a/plugins/kmail/bodypartformatter/attendeeselector.cpp
+++ b/plugins/kmail/bodypartformatter/attendeeselector.cpp
@@ -21,6 +21,7 @@
 #include "ui_attendeeselector.h"
 
 #include <libkdepim/addresseelineedit.h>
+#include <libemailfunctions/email.h>
 
 #include <klocale.h>
 #include <kpushbutton.h>
@@ -51,8 +52,15 @@ AttendeeSelector::AttendeeSelector(TQWidget * parent)
 TQStringList AttendeeSelector::attendees() const
 {
   TQStringList rv;
-  for ( uint i = 0; i < ui->attendeeList->count(); ++i )
-    rv << ui->attendeeList->item( i )->text();
+  for ( uint i = 0; i < ui->attendeeList->count(); ++i ) {
+    TQString addr = ui->attendeeList->item( i )->text();
+
+    // Build a nice address for this attendee including the CN.
+    TQString tname, temail;
+    KPIM::getNameAndMail( addr, tname, temail ); // ignore return value
+                                                 // which is always false
+    rv << temail;
+  }
   return rv;
 }