10 files changed, 23 insertions, 10 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 8487ff3..4de7da2 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -920,6 +920,7 @@ void AddressBook::postExternSync( AddressBook* aBook , const QString& csd, bool
 {
     //qDebug("AddressBook::postExternSync ");
     AddressBook::Iterator it;  
+    int foundEmpty = 0;
     for ( it = begin(); it != end(); ++it ) {
         //qDebug("check uid %s ", (*it).uid().latin1() );
         if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ||
@@ -927,7 +928,9 @@ void AddressBook::postExternSync( AddressBook* aBook , const QString& csd, bool
              (*it).tempSyncStat() == SYNC_TEMPSTATE_ADDED_EXTERNAL) {
             Addressee ad = aBook->findByUid( ( (*it).uid() ));
             if ( ad.isEmpty() ) {
-                qDebug("postExternSync:ERROR addressee is empty: %s ", (*it).uid().latin1());
+                ++foundEmpty;
+                //qDebug("postExternSync:addressee is empty: %s ", (*it).uid().latin1());
+                //qDebug("-- formatted name %s ",(*it).formattedName().latin1() );
             } else {
                 (*it).setIDStr(":");
                 if ( setID ) {
@@ -942,6 +945,10 @@ void AddressBook::postExternSync( AddressBook* aBook , const QString& csd, bool
             }
         }
     }
+    if ( foundEmpty ) {
+        qDebug("postExternSync:%d empty addressees found:\n  probably filtered out by incoming sync filter.",foundEmpty  );
+    }
+        
 }
 
 bool   AddressBook::containsExternalUid( const QString& uid  )
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 568dfc4..d60cd6b 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -272,11 +272,13 @@ void Addressee::computeCsum(const QString &dev)
             l.append( t[iii]  );
     }
     uint cs = getCsum4List(l);
+
 #if 0
     for ( iii = 0; iii < l.count(); ++iii)
         qDebug("%d***%s***",iii,l[iii].latin1());
     qDebug("CSUM computed %d %s %s", cs,QString::number (cs ).latin1(), uid().latin1() );
 #endif
+    
     setCsum( dev, QString::number (cs ));
 }
 
diff --git a/kabc/secrecy.h b/kabc/secrecy.h
index 8f2f736..b2ff565 100644
--- a/kabc/secrecy.h
+++ b/kabc/secrecy.h
@@ -59,7 +59,7 @@ public:
    *
    * @param type  The secrecy type, @see Types.
    */
-  Secrecy( int type = Invalid );
+  Secrecy( int type = Public );
 
   bool operator==( const Secrecy & ) const;
   bool operator!=( const Secrecy & ) const;
diff --git a/kabc/vcard/VCardv.cpp b/kabc/vcard/VCardv.cpp
index 1166aac..bad2ef1 100644
--- a/kabc/vcard/VCardv.cpp
+++ b/kabc/vcard/VCardv.cpp
@@ -172,7 +172,7 @@ VCard::_parse()
                 cur = (*it);
                 ++it;
                         while ( it!= l.end() && (*it).at(0) == ' '&& (*it).length()!= 1) {
-                        cur += (*it) ;
+                        cur += (*it).mid(1) ;
                         ++it;
                 }
                 --it;
diff --git a/kaddressbook/filter.cpp b/kaddressbook/filter.cpp
index 9cb4c2d..7a869fa 100644
--- a/kaddressbook/filter.cpp
+++ b/kaddressbook/filter.cpp
diff --git a/kaddressbook/filter.h b/kaddressbook/filter.h
index 26870d7..93f1352 100644
--- a/kaddressbook/filter.h
+++ b/kaddressbook/filter.h
diff --git a/kaddressbook/filtereditdialog.cpp b/kaddressbook/filtereditdialog.cpp
index 987f234..1194406 100644
--- a/kaddressbook/filtereditdialog.cpp
+++ b/kaddressbook/filtereditdialog.cpp
@@ -96,7 +96,6 @@ void FilterEditDialog::setFilter( const Filter &filter )
   mPublic->setChecked(c &Filter::ShowPublic);
   mPrivate->setChecked(c & Filter::ShowPrivate);
   mConfidential->setChecked(c & Filter::ShowConfidential);
-
 }
 
 Filter FilterEditDialog::filter()
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index e61f65f..aa04631 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -565,6 +565,8 @@ void KABCore::saveSettings()
   mViewManager->saveSettings();
 
   KABPrefs::instance()->mCurrentIncSearchField = mIncSearchWidget->currentItem();
+  KABPrefs::instance()->writeConfig();
+  qDebug("KABPrefs::instance()->writeConfig() ");
 }
 
 KABC::AddressBook *KABCore::addressBook() const
@@ -2685,6 +2687,7 @@ int  KABCore::takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, i
         remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) );
         //qDebug("loc %s  rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() );
         locCh = ( localMod > mLastAddressbookSync );
+        //qDebug("cahnged rem %d loc %d",remCh, locCh  );
         if ( !remCh && ! locCh ) {
             //qDebug("both not changed ");
             lastSync = localMod.addDays(1);
@@ -2762,8 +2765,9 @@ int  KABCore::takeAddressee( KABC::Addressee* local,  KABC::Addressee* remote, i
         //qDebug("lsy %s  ---  lo %s  --- re %s ", lastSync.toString().latin1(), localMod.toString().latin1(), remoteMod.toString().latin1()  );
         if ( lastSync > remoteMod )
             return 1;
-        if ( lastSync > localMod )
+        if ( lastSync > localMod ) {
             return 2;
+        }
         localIsNew = localMod >= remoteMod;
         //qDebug("conflict! ************************************** ");
         {
@@ -3006,10 +3010,12 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
         bool skipIncidence = false;
         if ( uid.left(19) == QString("last-syncAddressee-") )
             skipIncidence = true;
-        if ( !filterOUT.name().isEmpty() && ! filterOUT.filterAddressee( inL ) )
-            skipIncidence = true;
         if ( !skipIncidence )  {
             inL = local->findByUid( uid );
+            if ( (!filterOUT.name().isEmpty()) && (! filterOUT.filterAddressee( inL ) ) )
+                skipIncidence = true;
+        }
+        if ( !skipIncidence )  {
             if ( !inL.resource() || inL.resource()->includeInSync() ) {
                 inR = remote->findByUid( uid );
                 if ( inR.isEmpty() ) { //  no conflict ********** add or delete local
diff --git a/kaddressbook/kaddressbookmain.cpp b/kaddressbook/kaddressbookmain.cpp
index 2832257..519dc92 100644
--- a/kaddressbook/kaddressbookmain.cpp
+++ b/kaddressbook/kaddressbookmain.cpp
@@ -227,7 +227,7 @@ void KAddressBookMain::closeEvent( QCloseEvent* ce )
   {
     save();
     mCore->saveSettings();
-    KABPrefs::instance()->writeConfig();
+    //KABPrefs::instance()->writeConfig();
   }
 
   ce->accept();
diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp
index 9c3a641..4be860e 100644
--- a/kaddressbook/viewmanager.cpp
+++ b/kaddressbook/viewmanager.cpp
@@ -283,12 +283,11 @@ void ViewManager::setActiveView( const QString &name )
 
 //US performance optimization. setActiveFilter calls also mActiveView->refresh()
 //US mActiveView->refresh();
-
+    mCore->saveSettings();
   }
   else
   {
   qDebug("ViewManager::setActiveView: unable to find view" );
-    kdDebug(5720) << "ViewManager::setActiveView: unable to find view\n";
   }
 }