fixed one syncing problem

7 files changed, 25 insertions, 17 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 282560f..205dbc8 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2733,24 +2733,9 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
             mGlobalSyncMode = SYNC_MODE_EXTERNAL;
             isXML = true;
             abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice );
         } else {
-            Addressee lse =   mAddressBook->findByUid( "last-syncAddressee-"+mCurrentSyncDevice );
-            if ( ! lse.isEmpty() ) {
-                if ( lse.familyName().left(4) == "!E: " )
-                    external = true;
-            } else {
-                bool found = false;
-                AddressBook::Iterator it;
-                for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
-                    if ( (*it).revision().date().year() > 2003 ) {
-                        found = true;
-                        break;
-                    }
-                }
-                external = ! found;
-            }
-
+            external = !manager->mIsKapiFile;
             if ( external ) {
                 qDebug("Setting vcf mode to external ");
                 mGlobalSyncMode = SYNC_MODE_EXTERNAL;
                 AddressBook::Iterator it;  
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 6baa2ee..5175f94 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -179,8 +179,9 @@ void KSyncManager::slotSyncMenu( int action )
     mAskForPreferences = temp->getAskForPreferences();
     mSyncAlgoPrefs = temp->getSyncPrefs();
     mWriteBackFile = temp->getWriteBackFile();
     mWriteBackExistingOnly = temp->getWriteBackExisting();
+    mIsKapiFile = temp->getIsKapiFile();
     mWriteBackInFuture = 0;
     if ( temp->getWriteBackFuture() )
         mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
     mShowSyncSummary = temp->getShowSummaryAfterSync();
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 5b05383..9094aac 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -133,8 +133,9 @@ class KSyncManager : public QObject
     QStringList  mExternSyncProfiles;
     QStringList  mSyncProfileNames;
     bool mAskForPreferences;
     bool mShowSyncSummary;
+    bool mIsKapiFile;
     bool mWriteBackExistingOnly;
     int mSyncAlgoPrefs;
     bool mWriteBackFile;
     int  mWriteBackInFuture;
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index cf8f996..03265d2 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -241,8 +241,10 @@ void KSyncPrefsDialog::setupSyncAlgTab()
 
    mRemoteFile = new QLineEdit( temphb);
    mRemoteFileAB = new QLineEdit( temphb);
    mRemoteFilePWM = new QLineEdit( temphb);
+   mIsKapiFileL = new QCheckBox( i18n("Addressbook file (*.vcf) is used by KA/Pi"), localFileWidget );
+
 
    // *** remote
    remoteFileWidget = new QVBox( topFrame);
    topLayout->addMultiCellWidget(remoteFileWidget, iii,iii,0,1);
@@ -268,9 +270,9 @@ void KSyncPrefsDialog::setupSyncAlgTab()
    temphb = new QHBox( remoteFileWidget );
    mRemotePostcommand = new QLineEdit(temphb );
    mRemotePostcommandAB = new QLineEdit(temphb );
    mRemotePostcommandPWM = new QLineEdit(temphb );
-
+   mIsKapiFileR = new QCheckBox( i18n("Addressbook file is used by KA/Pi"), remoteFileWidget );
    lab = new QLabel( i18n("Fill in default values for:"), remoteFileWidget);
    temphb = new QHBox( remoteFileWidget );
    button = new QPushButton( i18n("ssh/scp"), temphb );
    connect ( button, SIGNAL( clicked()), this, SLOT (fillSSH() ) );
@@ -456,8 +458,11 @@ void KSyncPrefsDialog::profileChanged( int item )
     }
     mIsLocal->setChecked(prof->getIsLocalFileSync()) ;
     mIsPhone->setChecked(prof->getIsPhoneSync()) ;
     mIsPi->setChecked(prof->getIsPiSync()) ;
+    mIsKapiFileL->setChecked(prof->getIsKapiFile()) ;
+    mIsKapiFileR->setChecked(prof->getIsKapiFile()) ;
+
     mIsNotLocal->setChecked(!prof->getIsLocalFileSync() && !prof->getIsPhoneSync() &&!prof->getIsPiSync() );
     proGr->setEnabled( item > 2 );
     if ( item < 3 ) {
         localFileWidget->hide();
@@ -496,8 +501,14 @@ void KSyncPrefsDialog::fillFTP()
    
 }
 void KSyncPrefsDialog::kindChanged( bool b )
 {
+
+    if ( mIsLocal->isChecked () ) {
+        mIsKapiFileL->setChecked( mIsKapiFileR->isChecked() );
+    } else {
+        mIsKapiFileR->setChecked( mIsKapiFileL->isChecked() );
+    }
   
     if ( mIsLocal->isChecked () )
         localFileWidget->show();
     else
@@ -578,8 +589,9 @@ void KSyncPrefsDialog::saveProfile()
         prof->setSyncPrefs( syncprefs);
         prof->setIsLocalFileSync( mIsLocal->isChecked() );
         prof->setIsPhoneSync( mIsPhone->isChecked() );
         prof->setIsPiSync( mIsPi->isChecked() );
+        prof->setIsKapiFile( mIsKapiFileL->isChecked() );
         prof->setWriteBackFuture(mWriteBackFuture->isChecked());
         prof->setWriteBackFutureWeeks(mWriteBackFutureWeeks->value());
         if ( mWriteContactToSIM )
             prof->setWriteContactToSIM(mWriteContactToSIM->isChecked());
diff --git a/libkdepim/ksyncprefsdialog.h b/libkdepim/ksyncprefsdialog.h
index d3f8f4c..c601a58 100644
--- a/libkdepim/ksyncprefsdialog.h
+++ b/libkdepim/ksyncprefsdialog.h
@@ -145,7 +145,9 @@ class KSyncPrefsDialog : public KDialog
     QCheckBox* mWriteBackExisting;
     QCheckBox* mAskForPreferences;
     QCheckBox* mShowSummaryAfterSync;
     QCheckBox* mWriteContactToSIM;
+    QCheckBox* mIsKapiFileL;
+    QCheckBox* mIsKapiFileR;
 };
 
 #endif
diff --git a/libkdepim/ksyncprofile.cpp b/libkdepim/ksyncprofile.cpp
index 76dfe00..029b70b 100644
--- a/libkdepim/ksyncprofile.cpp
+++ b/libkdepim/ksyncprofile.cpp
@@ -75,8 +75,9 @@ KSyncProfile* KSyncProfile::clone()
     myClone->setIncludeInRingSyncPWM( mIncludeInRingSyncPWM );
     myClone->setSyncPrefs( mSyncPrefs);
     myClone->setIsLocalFileSync( mIsLocalFileSync );
     myClone->setIsPhoneSync( mIsPhoneSync );
+    myClone->setIsKapiFile( mIsKapiFile );
     myClone->setIsPiSync( mIsPiSync );
     myClone->setWriteContactToSIM( mWriteContactToSIM );
     myClone->setName( "noName" );
     //myClone->setIdentifier( "noID" );
@@ -124,8 +125,9 @@ void KSyncProfile::setDefault()
     mIsLocalFileSync = true;
     mName = "noName";
     mIsPhoneSync = false;
     mIsPiSync = false;
+    mIsKapiFile = false;
     mWriteContactToSIM = false;
     mPhoneDevice = "/dev/ircomm";
     mPhoneConnection = "irda";
     mPhoneModel = "6310i";
@@ -181,8 +183,9 @@ void KSyncProfile::readConfig(KConfig *config )
     mWriteBackFutureWeeks = config->readNumEntry( "WriteBackFutureWeeks", mWriteBackFutureWeeks );
     mIsLocalFileSync= config->readBoolEntry( "IsLocalFileSync", mIsLocalFileSync );
     mIsPhoneSync= config->readBoolEntry( "IsPhoneSync", mIsPhoneSync );
     mIsPiSync= config->readBoolEntry( "IsPiSync", mIsPiSync );
+    mIsKapiFile = config->readBoolEntry( "IsKapiFile", mIsKapiFile );
   }
   else
   {
     setDefault();
@@ -243,6 +246,7 @@ void KSyncProfile::writeConfig( KConfig * config )
     config->writeEntry( "WriteBackFutureWeeks", mWriteBackFutureWeeks);
     config->writeEntry( "IsLocalFileSync", mIsLocalFileSync );
     config->writeEntry( "IsPhoneSync", mIsPhoneSync );
     config->writeEntry( "IsPiSync", mIsPiSync );
+    config->writeEntry( "IsKapiFile", mIsKapiFile );
 }
 
diff --git a/libkdepim/ksyncprofile.h b/libkdepim/ksyncprofile.h
index 6a68bd7..0a59111 100644
--- a/libkdepim/ksyncprofile.h
+++ b/libkdepim/ksyncprofile.h
@@ -133,8 +133,10 @@ class KSyncProfile : public QObject {
     void setIsPhoneSync( bool b ) { mIsPhoneSync= b;}
     bool getIsPhoneSync( ) { return mIsPhoneSync;}
     void setIsPiSync( bool b ) { mIsPiSync= b;}
     bool getIsPiSync( ) { return mIsPiSync;}
+    void setIsKapiFile( bool b ) { mIsKapiFile= b;}
+    bool getIsKapiFile( ) { return mIsKapiFile;}
   private:
     QString mName;
     QString mPreSyncCommand;
     QString mPostSyncCommand;
@@ -179,7 +181,8 @@ class KSyncProfile : public QObject {
     bool mIsPhoneSync;
     bool mWriteContactToSIM;
 
     bool mIsPiSync;
+    bool mIsKapiFile;
 };
 
 #endif