| author | zautrix <zautrix> | 2004-10-09 10:29:56 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-10-09 10:29:56 (UTC) |
| commit | ed1eac5e36e675b030cb5a5aa90fb2d44eb40c73 (patch) (side-by-side diff) | |
| tree | 2d4dd35819f17c4b5758b64defd40e7a4bf3cbde | |
| parent | 69af2ac56474e3a1e3e59be318caf53f5d357f94 (diff) | |
| download | kdepimpi-ed1eac5e36e675b030cb5a5aa90fb2d44eb40c73.zip kdepimpi-ed1eac5e36e675b030cb5a5aa90fb2d44eb40c73.tar.gz kdepimpi-ed1eac5e36e675b030cb5a5aa90fb2d44eb40c73.tar.bz2 | |
phone fixes
| -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 @@ -39,8 +39,9 @@ $Id$ */ #include <qptrlist.h> #include <qtextstream.h> #include <qfile.h> +#include <qregexp.h> #include <kglobal.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index efcd492..7ec3fca 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -2808,9 +2808,10 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode) { 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 ); } diff --git a/libkdepim/phoneaccess.cpp b/libkdepim/phoneaccess.cpp index 357cd39..fe914dd 100644 --- a/libkdepim/phoneaccess.cpp +++ b/libkdepim/phoneaccess.cpp @@ -130,15 +130,19 @@ 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; |