sync fixes

1 files changed, 24 insertions, 21 deletions

diff --git a/kde2file/caldump/main.cpp b/kde2file/caldump/main.cpp
index 8d81307..03571b9 100644
--- a/kde2file/caldump/main.cpp
+++ b/kde2file/caldump/main.cpp
@@ -119,5 +119,5 @@ int main( int argc, char *argv[] )
     qDebug("**************kdecaldump************* ");
     qDebug("************************************* ");
-    qDebug("Using timezone id: %s", calendarResource->timeZoneId().latin1());
+    qDebug("Using timezone ID: %s", calendarResource->timeZoneId().latin1());
 
     if ( !read ) {
@@ -153,4 +153,5 @@ int main( int argc, char *argv[] )
 
     } else {
+        qDebug("*************************load");
         localCalendar = new CalendarLocal();
         localCalendar->setTimeZoneId( calendarResource->timeZoneId());
@@ -161,4 +162,5 @@ int main( int argc, char *argv[] )
         int add = 0;
         if ( storage->load() ) {
+            qDebug("*************************loaded!");
             KCal::Incidence::List  newInc = localCalendar->rawIncidences();
             Incidence::List::ConstIterator it;
@@ -199,26 +201,27 @@ int main( int argc, char *argv[] )
                     ++add;
                 }
-                KCal::Incidence::List  allInc = calendarResource->rawIncidences();
+            }
+            KCal::Incidence::List  allInc = calendarResource->rawIncidences();
                 
-                for( it = allInc.begin(); it != allInc.end(); ++it ) {
-                    ResourceCalendar * re = calendarResource->resource( (*it) );
-                    if ( re && !re->readOnly() ) {
-                        Incidence* cl = localCalendar->incidence( (*it)->uid() );
-                        if ( !cl ) {
-                            ++del;  
-                            cl = (*it);
-                            if ( cl->type() == "Journal" )
-                                calendarResource->deleteJournal( (Journal *) cl  );
-                            else if ( cl->type() == "Todo" )
-                                calendarResource->deleteTodo( (Todo *) cl );
-                            else if ( cl->type() == "Event" )
-                                calendarResource->deleteEvent( (Event *) cl );
-                            //QDateTime lm = cl->lastModified();
-                            //cl->setResources( (*it)->resources() );
-                            //cl->setLastModified(lm);
-                        }  
-                    }
+            for( it = allInc.begin(); it != allInc.end(); ++it ) {
+                ResourceCalendar * re = calendarResource->resource( (*it) );
+                if ( re && !re->readOnly() ) {
+                    Incidence* cl = localCalendar->incidence( (*it)->uid() );
+                    if ( !cl ) {
+                        ++del;  
+                        cl = (*it);
+                        if ( cl->type() == "Journal" )
+                            calendarResource->deleteJournal( (Journal *) cl  );
+                        else if ( cl->type() == "Todo" )
+                            calendarResource->deleteTodo( (Todo *) cl );
+                        else if ( cl->type() == "Event" )
+                            calendarResource->deleteEvent( (Event *) cl );
+                        //QDateTime lm = cl->lastModified();
+                        //cl->setResources( (*it)->resources() );
+                        //cl->setLastModified(lm);
+                    }  
                 }
             }
+            
             calendarResource->save();
             qDebug("************************************* ");
@@ -228,5 +231,5 @@ int main( int argc, char *argv[] )
             
         } else
-            qDebug("error loading file /tmp/kdedumpall.ics");
+            qDebug("ERROR loading file %s",fileName.latin1() );
 
     }