author | zautrix <zautrix> | 2004-10-14 10:19:14 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-14 10:19:14 (UTC) |
commit | dddcb44c8428e9054a91eea0c7483ee88ee03452 (patch) (unidiff) | |
tree | 0c6b26192c70f8cfccd00f527f56a39109a11f2d /libkcal/phoneformat.cpp | |
parent | 3d79ab275374292196c7d032ffd2e321841c8cb0 (diff) | |
download | kdepimpi-dddcb44c8428e9054a91eea0c7483ee88ee03452.zip kdepimpi-dddcb44c8428e9054a91eea0c7483ee88ee03452.tar.gz kdepimpi-dddcb44c8428e9054a91eea0c7483ee88ee03452.tar.bz2 |
phone calendar fixes
-rw-r--r-- | libkcal/phoneformat.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp index 3555dc6..281434e 100644 --- a/libkcal/phoneformat.cpp +++ b/libkcal/phoneformat.cpp | |||
@@ -293,15 +293,13 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal) | |||
293 | #ifdef _WIN32_ | 293 | #ifdef _WIN32_ |
294 | fileName = locateLocal("tmp", "phonefile.vcs"); | 294 | fileName = locateLocal("tmp", "phonefile.vcs"); |
295 | #else | 295 | #else |
296 | fileName = "/tmp/phonefile.vcs"; | 296 | fileName = "/tmp/phonefile.vcs"; |
297 | #endif | 297 | #endif |
298 | QString command; | 298 | QString command; |
299 | int ret = PhoneAccess::readFromPhone( fileName ); | 299 | if ( ! PhoneAccess::readFromPhone( fileName )) { |
300 | if ( ret != 0 ) { | ||
301 | qDebug("Error::command returned %d", ret); | ||
302 | return false; | 300 | return false; |
303 | } | 301 | } |
304 | VCalFormat vfload; | 302 | VCalFormat vfload; |
305 | vfload.setLocalTime ( true ); | 303 | vfload.setLocalTime ( true ); |
306 | qDebug("loading file ..."); | 304 | qDebug("loading file ..."); |
307 | 305 | ||
@@ -484,14 +482,17 @@ bool PhoneFormat::writeToPhone( Calendar * calendar) | |||
484 | #else | 482 | #else |
485 | QString fileName = "/tmp/kdepimtemp.vcs"; | 483 | QString fileName = "/tmp/kdepimtemp.vcs"; |
486 | #endif | 484 | #endif |
487 | 485 | ||
488 | VCalFormat vfsave; | 486 | VCalFormat vfsave; |
489 | vfsave.setLocalTime ( true ); | 487 | vfsave.setLocalTime ( true ); |
488 | QString id = calendar->timeZoneId(); | ||
489 | calendar->setLocalTime(); | ||
490 | if ( ! vfsave.save( calendar, fileName ) ) | 490 | if ( ! vfsave.save( calendar, fileName ) ) |
491 | return false; | 491 | return false; |
492 | calendar->setTimeZoneId( id ); | ||
492 | return PhoneAccess::writeToPhone( fileName ); | 493 | return PhoneAccess::writeToPhone( fileName ); |
493 | } | 494 | } |
494 | bool PhoneFormat::save( Calendar *calendar) | 495 | bool PhoneFormat::save( Calendar *calendar) |
495 | { | 496 | { |
496 | QLabel status ( i18n(" Opening device ..."), 0 ); | 497 | QLabel status ( i18n(" Opening device ..."), 0 ); |
497 | int w = status.sizeHint().width()+20 ; | 498 | int w = status.sizeHint().width()+20 ; |