| author | zautrix <zautrix> | 2005-12-02 09:42:53 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-12-02 09:42:53 (UTC) |
| commit | a75d2c26aba6cffae8c3f61e173940240042427b (patch) (side-by-side diff) | |
| tree | 68f4b61c150bc263a98c78fdf8671bbbc17cdaf8 /kaddressbook | |
| parent | 64be8d64fc26d1025a24150d065197ba5d608f3d (diff) | |
| download | kdepimpi-a75d2c26aba6cffae8c3f61e173940240042427b.zip kdepimpi-a75d2c26aba6cffae8c3f61e173940240042427b.tar.gz kdepimpi-a75d2c26aba6cffae8c3f61e173940240042427b.tar.bz2 | |
more sync
| -rw-r--r-- | kaddressbook/kabcore.cpp | 6 | ||||
| -rw-r--r-- | kaddressbook/kabcore.h | 2 |
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 @@ -1937,7 +1937,7 @@ void KABCore::initGUI() 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 ); @@ -3460,13 +3460,13 @@ bool KABCore::syncPhone() 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!") ); diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index 2d1505f..e69cb60 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -356,7 +356,7 @@ class KABCore : public QWidget, public KSyncInterface 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(); |