From 826dc960353e47a60aba13916189c45ef3392c1e Mon Sep 17 00:00:00 2001 From: zautrix Date: Thu, 07 Oct 2004 12:19:25 +0000 Subject: sync fixes --- diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index 295cf03..03a86f9 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp @@ -414,7 +414,6 @@ void AddressBook::importFromFile( QString fileName ) QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); KABC::VCardTool tool; list = tool.parseVCards( data ); - KABC::Addressee::List::Iterator it; for ( it = list.begin(); it != list.end(); ++it ) { (*it).setResource( 0 ); diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index fa80f5c..12502b0 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -2858,7 +2858,6 @@ bool KABCore::syncExternal(KSyncManager* manager, QString resource) void KABCore::getFile( bool success ) { - qDebug("KABCore::getFile "); QTimer::singleShot( 15000, this , SLOT ( setCaptionBack())); if ( ! success ) { setCaption( i18n("Error receiving file. Nothing changed!") ); @@ -2866,6 +2865,7 @@ void KABCore::getFile( bool success ) } mAddressBook->importFromFile( sentSyncFile() ); topLevelWidget()->setCaption( i18n("Pi-Sync successful!") ); + mViewManager->refreshView(); } void KABCore::syncFileRequest() { diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h index aad48d9..32400af 100644 --- a/libkdepim/ksyncmanager.h +++ b/libkdepim/ksyncmanager.h @@ -122,7 +122,6 @@ class KSyncManager : public QObject void setDefaultFileName( QString s) { mDefFileName = s ;} QString defaultFileName() { return mDefFileName ;} QString syncFileName(); - void fillSyncMenu(); QString getCurrentSyncDevice() { return mCurrentSyncDevice; } QString getCurrentSyncName() { return mCurrentSyncName; } @@ -158,6 +157,7 @@ class KSyncManager : public QObject void getFile( bool ); public slots: + void fillSyncMenu(); void slotSyncMenu( int ); void deleteCommandSocket(KCommandSocket*s, int state); void readFileFromSocket(); -- cgit v0.9.0.2