more sync

1 files changed, 3 insertions, 3 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 5d377bf..7d8586a 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1892,97 +1892,97 @@ void KABCore::initGUI()
 
    mExtensionManager = new ExtensionManager( this, mMiniSplitter );
 #endif
    //eh->hide();
   // topLayout->addWidget(mExtensionManager );
 
 
 /*US
 #ifndef KAB_NOSPLITTER
   QHBoxLayout *topLayout = new QHBoxLayout( this );
 //US  topLayout->setSpacing( KDialogBase::spacingHint() );
   topLayout->setSpacing( 10 );
 
   mDetailsSplitter = new QSplitter( this );
 
   QVBox *viewSpace = new QVBox( mDetailsSplitter );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( mDetailsSplitter );
 
   topLayout->addWidget( mDetailsSplitter );
   topLayout->setStretchFactor( mDetailsSplitter, 100 );
 #else //KAB_NOSPLITTER
   QHBoxLayout *topLayout = new QHBoxLayout( this );
 //US  topLayout->setSpacing( KDialogBase::spacingHint() );
   topLayout->setSpacing( 10 );
 
 //  mDetailsSplitter = new QSplitter( this );
 
   QVBox *viewSpace = new QVBox( this );
 
   mViewManager = new ViewManager( this, viewSpace );
   viewSpace->setStretchFactor( mViewManager, 1 );
 
   mDetails = new ViewContainer( this );
 
   topLayout->addWidget( viewSpace );
 //  topLayout->setStretchFactor( mDetailsSplitter, 100 );
   topLayout->addWidget( mDetails );
 #endif //KAB_NOSPLITTER
 */
 
   syncManager = new KSyncManager((QWidget*)this, (KSyncInterface*)this, KSyncManager::KAPI, KABPrefs::instance(), syncMenu);
   syncManager->setBlockSave(false);
 
     connect(syncManager , SIGNAL( request_file(const QString &) ), this, SLOT( syncFileRequest(const QString &) ) );
-    connect(syncManager , SIGNAL( getFile( bool )), this, SLOT(getFile( bool ) ) );
+    connect(syncManager , SIGNAL( getFile( bool ,const QString &)), this, SLOT(getFile( bool ,const QString &) ) );
     QString sync_file = sentSyncFile();
     //qDebug("KABCore::initGUI()::setting tmp sync file to:%s ",sync_file.latin1());
     syncManager->setDefaultFileName( sync_file );
     //connect(syncManager , SIGNAL( ), this, SLOT( ) );
 
 #endif //KAB_EMBEDDED
   initActions();
 
 #ifdef KAB_EMBEDDED
   addActionsManually();
   //US make sure the export and import menues are initialized before creating the xxPortManager.
   mXXPortManager = new XXPortManager( this, this );
 
   // LR mIncSearchWidget = new IncSearchWidget( mMainWindow->getIconToolBar() );
   //mMainWindow->toolBar()->insertWidget(-1, 4, mIncSearchWidget);
   // mActionQuit->plug ( mMainWindow->toolBar());
   //mIncSearchWidget = new IncSearchWidget( mMainWindow->toolBar() );
   //mMainWindow->toolBar()->insertWidget(-1, 0, mIncSearchWidget);
   // mIncSearchWidget->hide();
   connect( mIncSearchWidget, SIGNAL( doSearch( const QString& ) ),
            SLOT( incrementalSearch( const QString& ) ) );
   connect( mIncSearchWidget, SIGNAL( scrollUP() ),mViewManager, SLOT( scrollUP() ) );
   connect( mIncSearchWidget, SIGNAL( scrollDOWN() ),mViewManager, SLOT( scrollDOWN() ) );
 
   mJumpButtonBar = new JumpButtonBar( this, this );
 
   topLayout->addWidget( mJumpButtonBar );
 //US  topLayout->setStretchFactor( mJumpButtonBar, 10 );
 
 // mMainWindow->getIconToolBar()->raise();
 
 #endif //KAB_EMBEDDED
 
 }
 void KABCore::initActions()
 {
 //US  qDebug("KABCore::initActions(): mIsPart %i", mIsPart);
 
 #ifndef KAB_EMBEDDED
   connect( QApplication::clipboard(), SIGNAL( dataChanged() ),
            SLOT( clipboardDataChanged() ) );
 #endif //KAB_EMBEDDED
 
   // file menu
  
     mActionMail = KStdAction::mail( this, SLOT( sendMail() ), actionCollection() );
     //mActionPrint = KStdAction::print( this, SLOT( print() ), actionCollection() );
     mActionPrint = new KAction( i18n( "&Print View" ), "fileprint", CTRL + Key_P, mViewManager,
@@ -3415,86 +3415,86 @@ bool KABCore::syncExternal(KSyncManager* manager, QString  resource)
     }
     disableBR( false );
     return syncOK;
 
 }
 void KABCore::message( QString m, bool startTimer)
 {
     topLevelWidget()->setCaption( m );
     qApp->processEvents();
     if ( startTimer )
         mMessageTimer->start( 15000, true );
     else
         mMessageTimer->stop();
 }
 bool KABCore::syncPhone()
 {
     QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
     QString fileName = getPhoneFile();
     if ( !PhoneAccess::readFromPhone( fileName) ) {
         message(i18n("Phone access failed!"));
         return false;
     }   
     AddressBook abLocal( fileName,"syncContact");
     bool syncOK = false;
      {
          abLocal.importFromFile( fileName );
         qDebug("KA: AB phone loaded ,sync device %s",mCurrentSyncDevice.latin1());
         mGlobalSyncMode = SYNC_MODE_EXTERNAL;
         abLocal.preparePhoneSync( mCurrentSyncDevice, true );
         abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true );
         syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
         syncManager->hideProgressBar();
         if (  syncOK ) {
             if ( syncManager->mWriteBackFile ) {
                 abLocal.removeSyncAddressees( true );
                 abLocal.saveABphone( fileName );
                 abLocal.findNewExtIds( fileName, mCurrentSyncDevice );
                 //abLocal.preparePhoneSync( mCurrentSyncDevice, false );
                 abLocal.postExternSync( mAddressBook,mCurrentSyncDevice, true );
             }
         }
         setModified();
     }
     abLocal.removeResources();
     if ( syncOK )
         mViewManager->refreshView();
     return syncOK;
 }
-void KABCore::getFile( bool success )
+void KABCore::getFile( bool success ,const QString & resource)
 {
     if ( ! success ) {
         message( i18n("Error receiving file. Nothing changed!") );
         return;
     }
-    int count = mAddressBook->importFromFile( sentSyncFile() , false, true );
+    int count = mAddressBook->importFromFile( sentSyncFile() , false, true ,resource);
     if ( count )
         setModified( true );
     message( i18n("Pi-Sync successful!") );
     mViewManager->refreshView();
 }
 void KABCore::syncFileRequest(const QString & resource)
 { 
     if ( KABPrefs::instance()->mPassiveSyncWithDesktop ) {
         syncManager->slotSyncMenu( 999 );
     } 
 
     if ( resource == "ALL" ) {
         mAddressBook->export2File( sentSyncFile() );
     }
     else
         mAddressBook->export2File( sentSyncFile(), resource);
 }
 QString KABCore::sentSyncFile()
 {
 #ifdef DESKTOP_VERSION
     return  locateLocal( "tmp", "copysyncab.vcf" );
 #else
     return QString( "/tmp/copysyncab.vcf" );
 #endif 
 }
 
 void KABCore::setCaptionBack()
 {
     mMessageTimer->stop();
     topLevelWidget()->setCaption( i18n("KA/Pi") );
 }