author | zautrix <zautrix> | 2004-09-12 22:05:14 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-12 22:05:14 (UTC) |
commit | 483c6ac49ea1764bdd154e33e220b7945a6ab754 (patch) (unidiff) | |
tree | 29d5cb00ff3a36595c2fb0e1125d3e2b8ec246a6 | |
parent | 185e2f4a2b10c65d8186dad63fe6cc3acd6b84f1 (diff) | |
download | kdepimpi-483c6ac49ea1764bdd154e33e220b7945a6ab754.zip kdepimpi-483c6ac49ea1764bdd154e33e220b7945a6ab754.tar.gz kdepimpi-483c6ac49ea1764bdd154e33e220b7945a6ab754.tar.bz2 |
fix for Z
-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 | |||
@@ -379,17 +379,21 @@ 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 ..."); |
@@ -610,17 +614,21 @@ bool PhoneFormat::save( Calendar *calendar) | |||
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 | } |