2 files changed, 4 insertions, 4 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 5d377bf..7d8586a 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1924,33 +1924,33 @@ void KABCore::initGUI()
 
   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());
@@ -3447,39 +3447,39 @@ bool KABCore::syncPhone()
         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);
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 2d1505f..e69cb60 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -343,33 +343,33 @@ class KABCore : public QWidget, public KSyncInterface
     /**
       Registers a new GUI client, so plugins can register its actions.
      */
    void addGUIClient( KXMLGUIClient *client );
 
    void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid);
    void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid);
    void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid);
 
 
   signals:
     void contactSelected( const QString &name );
     void contactSelected( const QPixmap &pixmap );
   public slots:
     void loadDataAfterStart();
     void recieve(QString cmsg );
-    void getFile( bool success );
+    void getFile( bool success,const QString & );
     void syncFileRequest(const QString &);
     void setDetailsVisible( bool visible );
     void setDetailsToState();
    
     void saveSettings();
 
   private slots:
     void updateToolBar();
     void updateMainWindow();
     void receive( const QCString& cmsg, const QByteArray& data );
     void receiveStart( const QCString& cmsg, const QByteArray& data );
     void toggleBeamReceive( );
     void disableBR(bool);
     void setJumpButtonBarVisible( bool visible );
     void setJumpButtonBar( bool visible );
     void setCaptionBack();