fixx

2 files changed, 8 insertions, 7 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index e0bd3f3..eaf4b56 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -3,6 +3,12 @@ Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.1.8 ************
 
+KO/Pi:
+Added info about the completion sate of a todo in the ListView/Searchdialog.
+If in TodoView is selected "do not show compledted todos" then completed todos are not shown in the ListView as well.
+
+KA/Pi:
+In the addressee selection dialog now the formatted name is shown, if not empty.
 
 ********** VERSION 2.1.7 ************
 
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index 19b52bb..e89584d 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -42,10 +42,7 @@ AddresseeItem::AddresseeItem( QListView *parent, const Addressee &addressee ) :
   QListViewItem( parent ),
   mAddressee( addressee )
 {
-    QString name = addressee.familyName()+", "+ addressee.givenName();
-    if ( name.length() == 2 )
-        name = addressee.organization();
-    setText( Name,name);
+    setText( Name,addressee.realName());
     setText( Email, addressee.preferredEmail() );
 }
 
@@ -165,9 +162,7 @@ void AddresseeDialog::loadAddressBook()
   for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 
       if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
             continue; 
-      QString name = (*it).familyName()+", "+ (*it).givenName();
-      if ( name.length() == 2 )
-          name = (*it).realName();
+      QString name = (*it).realName();
       name += (*it).preferredEmail();
 #if QT_VERSION >= 0x030000
       if (re.search(name) != -1)