export kapi fix

3 files changed, 14 insertions, 0 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 3532084..93edc59 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -9,2 +9,6 @@ Fixed a crash when reloading file, e.g. after a passive pi-sync synchronization.
 Added config option to not display completed todos in agenda view.
+Addressee view is now using the formatted name, if defined.
+That makes it possible to display "lastname, firstname" in that view now.
+To set the formatted name for all contacts, please use menu:
+Edit->Change->Set formatted name.
 
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index 9118c3d..667a5e2 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -45,2 +45,3 @@
 
+#include <qstylesheet.h> 
 #include "externalapphandler.h"
@@ -72,2 +73,3 @@ AddresseeView::AddresseeView( QWidget *parent, const char *name )
 
+
 }
@@ -127,4 +129,8 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
   }
+#if 0
   QString name = ( mAddressee.assembledName().isEmpty() ?
                    mAddressee.formattedName() : mAddressee.assembledName() );
+#endif
+
+  QString name =  mAddressee.realName();
 
diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp
index e134f97..278cab0 100644
--- a/kaddressbook/xxportselectdialog.cpp
+++ b/kaddressbook/xxportselectdialog.cpp
@@ -161,2 +161,3 @@ KABC::AddresseeList XXPortSelectDialog::contacts()
       if ( !addr.isEmpty() )
+          if ( addr.uid().left( 19 ) != QString("last-syncAddressee-") )
         list.append( addr );
@@ -173,2 +174,3 @@ KABC::AddresseeList XXPortSelectDialog::contacts()
       if ( (*filterIt).filterAddressee( *it ) )
+          if ((*it).uid().left( 19 ) != QString("last-syncAddressee-") )
         list.append( *it );
@@ -183,2 +185,3 @@ KABC::AddresseeList XXPortSelectDialog::contacts()
         if ( categorieList.contains( *tmpIt ) ) {
+          if ((*it).uid().left( 19 ) != QString("last-syncAddressee-") )
           list.append( *it );
@@ -191,2 +194,3 @@ KABC::AddresseeList XXPortSelectDialog::contacts()
     for ( it = mCore->addressBook()->begin(); it != mCore->addressBook()->end(); ++it )
+          if ((*it).uid().left( 19 ) != QString("last-syncAddressee-") )
       list.append( *it );