| -rw-r--r-- | kabc/addressbook.cpp | 1 | ||||
| -rw-r--r-- | kaddressbook/kabcore.cpp | 3 | ||||
| -rw-r--r-- | libkdepim/phoneaccess.cpp | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index 1a06956..1050f55 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp @@ -35,16 +35,17 @@ $Id$ #include <kinstance.h> #include <kstandarddirs.h> #include "errorhandler.h" */ #include <qptrlist.h> #include <qtextstream.h> #include <qfile.h> +#include <qregexp.h> #include <kglobal.h> #include <klocale.h> #include <kmessagebox.h> #include <kdebug.h> #include <libkcal/syncdefines.h> #include "addressbook.h" #include "resource.h" diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index efcd492..7ec3fca 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -2804,17 +2804,18 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode) //} syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode ); if ( syncOK ) { if ( syncManager->mWriteBackFile ) { if ( external ) abLocal.removeSyncAddressees( !isXML); qDebug("Saving remote AB "); - abLocal.saveAB(); + if ( ! abLocal.saveAB()) + qDebug("Error writing back AB to file "); if ( isXML ) { // afterwrite processing abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ); } } } setModified(); diff --git a/libkdepim/phoneaccess.cpp b/libkdepim/phoneaccess.cpp index 357cd39..fe914dd 100644 --- a/libkdepim/phoneaccess.cpp +++ b/libkdepim/phoneaccess.cpp @@ -126,22 +126,26 @@ void PhoneAccess::writeConfig( QString device, QString connection, QString model } bool PhoneAccess::writeToPhone( QString fileName) { #ifdef DESKTOP_VERSION +#ifdef _WIN32_ + QString command ="kammu --restore " + fileName ; +#else QString command ="./kammu --restore " + fileName ; +#endif #else QString command ="kammu --restore " + fileName ; #endif int ret; while ( (ret = system ( command.latin1())) != 0 ) { - qDebug("Error S::command returned %d. asking users", ret); + qDebug("Error S::command returned %d.", ret); int retval = KMessageBox::warningContinueCancel(0, i18n("Error accessing device!\nPlease turn on connection\nand retry!"),i18n("KO/Pi phone access"),i18n("Retry"),i18n("Cancel")); if ( retval != KMessageBox::Continue ) return false; } return true; } |