summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-07 12:19:25 (UTC)
committer zautrix <zautrix>2004-10-07 12:19:25 (UTC)
commit826dc960353e47a60aba13916189c45ef3392c1e (patch) (side-by-side diff)
tree52ef4058d7a1fa8d77e678391ed9165009634182
parent43c82cc5393522d2c34f34a4339cb6a1d1c6c555 (diff)
downloadkdepimpi-826dc960353e47a60aba13916189c45ef3392c1e.zip
kdepimpi-826dc960353e47a60aba13916189c45ef3392c1e.tar.gz
kdepimpi-826dc960353e47a60aba13916189c45ef3392c1e.tar.bz2
sync fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/addressbook.cpp1
-rw-r--r--kaddressbook/kabcore.cpp2
-rw-r--r--libkdepim/ksyncmanager.h2
3 files changed, 2 insertions, 3 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 295cf03..03a86f9 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -415,5 +415,4 @@ void AddressBook::importFromFile( QString fileName )
KABC::VCardTool tool;
list = tool.parseVCards( data );
-
KABC::Addressee::List::Iterator it;
for ( it = list.begin(); it != list.end(); ++it ) {
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index fa80f5c..12502b0 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2859,5 +2859,4 @@ bool KABCore::syncExternal(KSyncManager* manager, QString resource)
void KABCore::getFile( bool success )
{
- qDebug("KABCore::getFile ");
QTimer::singleShot( 15000, this , SLOT ( setCaptionBack()));
if ( ! success ) {
@@ -2867,4 +2866,5 @@ 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
@@ -123,5 +123,4 @@ class KSyncManager : public QObject
QString defaultFileName() { return mDefFileName ;}
QString syncFileName();
- void fillSyncMenu();
QString getCurrentSyncDevice() { return mCurrentSyncDevice; }
@@ -159,4 +158,5 @@ class KSyncManager : public QObject
public slots:
+ void fillSyncMenu();
void slotSyncMenu( int );
void deleteCommandSocket(KCommandSocket*s, int state);