summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kde2file/abdump/main.cpp5
-rw-r--r--libkdepim/ksyncmanager.cpp14
2 files changed, 16 insertions, 3 deletions
diff --git a/kde2file/abdump/main.cpp b/kde2file/abdump/main.cpp
index 9ad78e5..b359cfe 100644
--- a/kde2file/abdump/main.cpp
+++ b/kde2file/abdump/main.cpp
@@ -184,8 +184,11 @@ int main( int argc, char *argv[] )
184 } else 184 } else
185 qDebug("error open file "); 185 qDebug("error open file ");
186 } 186 }
187 standardAddressBook->close();
188 // line not needed by KDE 3.4:
189 // delete standardAddressBook;
190
187 191
188 delete standardAddressBook;
189 //KABC::StdAddressBook::close(); 192 //KABC::StdAddressBook::close();
190 //StdAddressBook::mSelf = 0; 193 //StdAddressBook::mSelf = 0;
191 qDebug("ente "); 194 qDebug("ente ");
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index d59f4a4..7319285 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -922,7 +922,12 @@ void KSyncManager::syncKDE()
922 if ( ! QFile::exists ( command ) ) 922 if ( ! QFile::exists ( command ) )
923 command = "kdeabdump"; 923 command = "kdeabdump";
924 QString fileName = QDir::homeDirPath ()+"/.kdeaddressbookdump.vcf"; 924 QString fileName = QDir::homeDirPath ()+"/.kdeaddressbookdump.vcf";
925 system ( command.latin1()); 925 int result = system ( command.latin1());
926 qDebug("AB dump command call result: %d ", result);
927 if ( result != 0 ) {
928 KMessageBox::error( 0, i18n("Error accessing KDE addressbook data.\nMake sure the file\n/opt/kdepimpi/kdeabdump\nexists.The standard version of this file\nis for syncing with KDE 3.4.x.\nIf you are running KDE 3.3.x please\ndownload the KDE 3.3.x version of this file\nat http://sourceforge.net/projects/kdepimpi/\nsection: general files for KDE/Pim."));
929 return;
930 }
926 if ( syncWithFile( fileName,true ) ) { 931 if ( syncWithFile( fileName,true ) ) {
927 if ( mWriteBackFile ) { 932 if ( mWriteBackFile ) {
928 command += " --read"; 933 command += " --read";
@@ -942,7 +947,12 @@ void KSyncManager::syncKDE()
942 if ( ! QFile::exists ( command ) ) 947 if ( ! QFile::exists ( command ) )
943 command = "kdecaldump"; 948 command = "kdecaldump";
944 QString fileName = QDir::homeDirPath ()+"/.kdecalendardump.ics"; 949 QString fileName = QDir::homeDirPath ()+"/.kdecalendardump.ics";
945 system ( command.latin1()); 950 int result = system ( command.latin1());
951 qDebug("Cal dump command call result result: %d ", result);
952 if ( result != 0 ) {
953 KMessageBox::error( 0, i18n("Error accessing KDE calendar data.\nMake sure the file\n/opt/kdepimpi/kdecaldump\nexists.The standard version of this file\nis for syncing with KDE 3.4.x.\nIf you are running KDE 3.3.x please\ndownload the KDE 3.3.x version of this file\nat http://sourceforge.net/projects/kdepimpi/\nsection: general files for KDE/Pim."));
954 return;
955 }
946 if ( syncWithFile( fileName,true ) ) { 956 if ( syncWithFile( fileName,true ) ) {
947 if ( mWriteBackFile ) { 957 if ( mWriteBackFile ) {
948 command += " --read"; 958 command += " --read";