more sync fixes

2 files changed, 14 insertions, 3 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 8882259..592d78d 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -376,6 +376,7 @@ bool AddressBook::save( Ticket *ticket )
 
   return false;
 }
+// exports all Addressees, which are syncable
 void  AddressBook::export2File( QString fileName )
 {
   
@@ -391,6 +392,7 @@ void  AddressBook::export2File( QString fileName )
   KABC::VCardConverter::Version version;
   version = KABC::VCardConverter::v3_0;
   for ( it = begin(); it != end(); ++it ) {
+      if ( (*it).resource() && (*it).resource()->includeInSync() ) {
       if ( !(*it).IDStr().isEmpty() ) {
           (*it).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*it).IDStr() );
       }
@@ -400,6 +402,7 @@ void  AddressBook::export2File( QString fileName )
     converter.addresseeToVCard( *it, vcard, version );
     t << vcard << "\r\n";
   }
+  }
   t <<  "\r\n\r\n";
   outFile.close(); 
 }
@@ -419,6 +422,8 @@ bool  AddressBook::export2PhoneFormat( QStringList uids ,QString fileName )
       KABC::Addressee a = ( *it );
       if ( a.isEmpty() )
           continue;
+      if ( all && a.resource() && !a.resource()->includeInSync() )
+          continue;
       a.simplifyEmails();
       a.simplifyPhoneNumbers();
       a.simplifyPhoneNumberTypes();
@@ -476,7 +481,7 @@ void  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool rem
 {
 
     if ( removeOld )
-        setUntagged();
+        setUntagged( true );
     KABC::Addressee::List list;
     QFile file( fileName );
     file.open( IO_ReadOnly );
@@ -506,10 +511,16 @@ void  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool rem
     if ( removeOld )
         removeUntagged();
 }
-void AddressBook::setUntagged()
+void AddressBook::setUntagged(bool setNonSyncTagged) // = false)
 {
     Iterator ait;
     for ( ait = begin(); ait != end(); ++ait ) {
+        if ( setNonSyncTagged ) {
+            if ( (*ait).resource() && ! (*ait).resource()->includeInSync() ) {
+                (*ait).setTagged( true );
+            } else
+                (*ait).setTagged( false );
+        } else
         (*ait).setTagged( false );
     }
 }
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index a6bf451..23bba02 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -148,7 +148,7 @@ class AddressBook : public QObject
     void export2File( QString fileName );
     bool export2PhoneFormat(  QStringList uids ,QString fileName );
     void importFromFile( QString fileName,  bool replaceLabel = false, bool removeOld = false );
-    void setUntagged();
+    void setUntagged( bool setNonSyncTagged = false );
     void removeUntagged();
     void findNewExtIds(  QString fileName, QString currentSyncDevice  );
     /**