summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-14 10:19:14 (UTC)
committer zautrix <zautrix>2004-10-14 10:19:14 (UTC)
commitdddcb44c8428e9054a91eea0c7483ee88ee03452 (patch) (unidiff)
tree0c6b26192c70f8cfccd00f527f56a39109a11f2d
parent3d79ab275374292196c7d032ffd2e321841c8cb0 (diff)
downloadkdepimpi-dddcb44c8428e9054a91eea0c7483ee88ee03452.zip
kdepimpi-dddcb44c8428e9054a91eea0c7483ee88ee03452.tar.gz
kdepimpi-dddcb44c8428e9054a91eea0c7483ee88ee03452.tar.bz2
phone calendar fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libkcal/phoneformat.cpp7
-rw-r--r--libkdepim/phoneaccess.cpp2
2 files changed, 5 insertions, 4 deletions
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index 3555dc6..281434e 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -298,5 +298,3 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
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;
@@ -489,4 +487,7 @@ bool PhoneFormat::writeToPhone( Calendar * calendar)
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 );
diff --git a/libkdepim/phoneaccess.cpp b/libkdepim/phoneaccess.cpp
index 5fafa1f..8298aa6 100644
--- a/libkdepim/phoneaccess.cpp
+++ b/libkdepim/phoneaccess.cpp
@@ -165,3 +165,3 @@ bool PhoneAccess::readFromPhone( QString fileName)
165 while ( (ret = system ( command.latin1())) != 0 ) { 165 while ( (ret = system ( command.latin1())) != 0 ) {
166 qDebug("Error S::command returned %d.", ret); 166 qDebug("Error reading from phone:Command returned %d", ret);
167 int retval = KMessageBox::warningContinueCancel(0, 167 int retval = KMessageBox::warningContinueCancel(0,