4 files changed, 15 insertions, 6 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
@@ -255,13 +255,13 @@ void Addressee::computeCsum(const QString &dev)
         l.append( t[iii]  );
     t = mData->custom;
     t.sort();
-    for ( iii = 0; iii < t.count(); ++iii)
+    for ( iii = 0; iii < t.count(); ++iii) 
         if ( t[iii].left( 25 ) != "KADDRESSBOOK-X-ExternalID" ) {
             int find = t[iii].find (':')+1;
             //qDebug("lennnn %d %d  ", find, t[iii].length());
             if ( find < t[iii].length())
-                 l.append( t[iii]  );
-
+                l.append( t[iii]  );
+            
         }
     KABC::Address::List::Iterator addressIter;
     for ( addressIter = mData->addresses.begin(); addressIter != mData->addresses.end();
@@ -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;