-rw-r--r-- | libkcal/phoneformat.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp index 99d6a06..c67dc6a 100644 --- a/libkcal/phoneformat.cpp +++ b/libkcal/phoneformat.cpp | |||
@@ -375,25 +375,29 @@ ulong PhoneFormat::getCsum( const QStringList & attList) | |||
375 | //extern "C" GSM_Error GSM_InitConnection(GSM_StateMachine *s, int ReplyNum); | 375 | //extern "C" GSM_Error GSM_InitConnection(GSM_StateMachine *s, int ReplyNum); |
376 | #include <stdlib.h> | 376 | #include <stdlib.h> |
377 | #define DEBUGMODE false | 377 | #define DEBUGMODE false |
378 | bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal) | 378 | bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal) |
379 | { | 379 | { |
380 | 380 | ||
381 | QString fileName; | 381 | QString fileName; |
382 | #ifdef _WIN32_ | 382 | #ifdef _WIN32_ |
383 | fileName = locateLocal("data", "korganizer") + "\\tempfile.vcs"; | 383 | fileName = locateLocal("data", "korganizer") + "\\tempfile.vcs"; |
384 | #else | 384 | #else |
385 | fileName = "/tmp/kdepimtemp.vcs"; | 385 | fileName = "/tmp/kdepimtemp.vcs"; |
386 | #endif | 386 | #endif |
387 | #ifdef DESKTOP_VERSION | ||
387 | QString command ="./kammu --backup " + fileName + " -yes" ; | 388 | QString command ="./kammu --backup " + fileName + " -yes" ; |
389 | #else | ||
390 | QString command ="kammu --backup " + fileName + " -yes" ; | ||
391 | #endif | ||
388 | int ret = system ( command.latin1() ); | 392 | int ret = system ( command.latin1() ); |
389 | if ( ret != 0 ) { | 393 | if ( ret != 0 ) { |
390 | qDebug("Error::command returned %d", ret); | 394 | qDebug("Error::command returned %d", ret); |
391 | return false; | 395 | return false; |
392 | } | 396 | } |
393 | VCalFormat vfload; | 397 | VCalFormat vfload; |
394 | vfload.setLocalTime ( true ); | 398 | vfload.setLocalTime ( true ); |
395 | qDebug("loading file ..."); | 399 | qDebug("loading file ..."); |
396 | 400 | ||
397 | if ( ! vfload.load( calendar, fileName ) ) | 401 | if ( ! vfload.load( calendar, fileName ) ) |
398 | return false; | 402 | return false; |
399 | QPtrList<Event> er = calendar->rawEvents(); | 403 | QPtrList<Event> er = calendar->rawEvents(); |
@@ -606,25 +610,29 @@ bool PhoneFormat::save( Calendar *calendar) | |||
606 | if ( to->isCompleted()) { | 610 | if ( to->isCompleted()) { |
607 | calendar->deleteTodo( to ); | 611 | calendar->deleteTodo( to ); |
608 | } | 612 | } |
609 | } | 613 | } |
610 | to = tl.next(); | 614 | to = tl.next(); |
611 | } | 615 | } |
612 | // 3 save file | 616 | // 3 save file |
613 | VCalFormat vfsave; | 617 | VCalFormat vfsave; |
614 | vfsave.setLocalTime ( true ); | 618 | vfsave.setLocalTime ( true ); |
615 | if ( ! vfsave.save( calendar, fileName ) ) | 619 | if ( ! vfsave.save( calendar, fileName ) ) |
616 | return false; | 620 | return false; |
617 | // 4 call kammu | 621 | // 4 call kammu |
622 | #ifdef DESKTOP_VERSION | ||
618 | QString command ="./kammu --restore " + fileName ; | 623 | QString command ="./kammu --restore " + fileName ; |
624 | #else | ||
625 | QString command ="kammu --restore " + fileName ; | ||
626 | #endif | ||
619 | int ret; | 627 | int ret; |
620 | while ( (ret = system ( command.latin1())) != 0 ) { | 628 | while ( (ret = system ( command.latin1())) != 0 ) { |
621 | qDebug("Error S::command returned %d. asking users", ret); | 629 | qDebug("Error S::command returned %d. asking users", ret); |
622 | int retval = KMessageBox::warningContinueCancel(0, | 630 | int retval = KMessageBox::warningContinueCancel(0, |
623 | i18n("Error accessing device!\nPlease turn on connection\nand retry!"),i18n("KO/Pi phone sync"),i18n("Retry"),i18n("Cancel")); | 631 | i18n("Error accessing device!\nPlease turn on connection\nand retry!"),i18n("KO/Pi phone sync"),i18n("Retry"),i18n("Cancel")); |
624 | if ( retval != KMessageBox::Continue ) | 632 | if ( retval != KMessageBox::Continue ) |
625 | return false; | 633 | return false; |
626 | } | 634 | } |
627 | 635 | ||
628 | // 5 reread data | 636 | // 5 reread data |
629 | message = i18n(" Rereading all data ... "); | 637 | message = i18n(" Rereading all data ... "); |
630 | status.setText ( message ); | 638 | status.setText ( message ); |