summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-09-14 03:13:52 (UTC)
committer zautrix <zautrix>2004-09-14 03:13:52 (UTC)
commitf1f43030eefa765950cb501aece6cc71fb4e9859 (patch) (side-by-side diff)
treed7396ac13ab052ee38e2e8e139854cc88a289a43
parent5060b0737c0c279859cac3bcfb73d2ac21c6a79e (diff)
downloadkdepimpi-f1f43030eefa765950cb501aece6cc71fb4e9859.zip
kdepimpi-f1f43030eefa765950cb501aece6cc71fb4e9859.tar.gz
kdepimpi-f1f43030eefa765950cb501aece6cc71fb4e9859.tar.bz2
More fixes
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/calendarview.cpp7
-rw-r--r--libkcal/sharpformat.cpp18
2 files changed, 20 insertions, 5 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 5a6d615..369c7a0 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -731,6 +731,5 @@ int CalendarView::takeEvent( Incidence* local, Incidence* remote, int mode , b
remCh = ( remote->getCsum(mCurrentSyncDevice) != local->getCsum(mCurrentSyncDevice) );
- if ( remCh )
- qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() );
+ //if ( remCh )
+ //qDebug("loc %s rem %s", local->getCsum(mCurrentSyncDevice).latin1(), remote->getCsum(mCurrentSyncDevice).latin1() );
locCh = ( local->lastModified() > mLastCalendarSync );
- //qDebug("locCh %d remCh %d locuid %d remuid %d", locCh, remCh,local->zaurusUid(), remote->zaurusUid() );
if ( !remCh && ! locCh ) {
@@ -1117,3 +1116,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
++addedEventR;
- qDebug("remote added Incidence %s ", inL->summary().latin1());
+ //qDebug("remote added Incidence %s ", inL->summary().latin1());
inL->setLastModified( modifiedCalendar );
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp
index a53b3f8..e7fc670 100644
--- a/libkcal/sharpformat.cpp
+++ b/libkcal/sharpformat.cpp
@@ -483,2 +483,5 @@ int SharpFormat::getNumFromRecord( QString answer, Incidence* inc )
}
+ if ( ok && newnum == -1 ) {
+ qDebug("Error writing back %s ", inc->summary().latin1());
+ }
}
@@ -534,3 +537,16 @@ bool SharpFormat::save( Calendar *calendar)
else if ( ev->getID("Sharp_DTM").isEmpty() ) { // add new
- command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName;
+ QString fileNameIn = "/tmp/kopitempin";
+ QFile fileIn( fileNameIn );
+ if (!fileIn.open( IO_WriteOnly ) ) {
+ return false;
+ }
+ QTextStream tsIn( &fileIn );
+ tsIn.setCodec( QTextCodec::codecForName("utf8") );
+ tsIn << ePrefix << eString ;
+ fileIn.close();
+ //command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName;
+ command = "(cat /tmp/kopitempin | db2file datebook -w -g -c " + codec+ ") > "+ fileName;
+ qDebug("command ++++++++ ");
+ qDebug("%s ",command.latin1());
+ qDebug("command -------- ");
system ( command.utf8() );