[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/kpilot/conduits/vcalconduit
From:       Adriaan de Groot <groot () kde ! org>
Date:       2005-04-28 12:18:52
Message-ID: 20050428121852.E2DBC668 () office ! kde ! org
[Download RAW message or body]

CVS commit by adridg: 

Consistency and bugfix from Philip T.


  M +2 -2      todo-conduit.cc   1.61
  M +2 -2      vcal-conduit.cc   1.112


--- kdepim/kpilot/conduits/vcalconduit/todo-conduit.cc  #1.60:1.61
@@ -150,5 +150,5 @@ KCal::Incidence *TodoConduitPrivate::get
         if ( fAllTodosIterator != fAllTodos.end() ) e=*fAllTodosIterator;
         while (fAllTodosIterator != fAllTodos.end() &&
-                e && e->syncStatus()!=KCal::Incidence::SYNCMOD)
+                e && e->syncStatus()!=KCal::Incidence::SYNCMOD && e->pilotId())
         {
                 e = (++fAllTodosIterator != fAllTodos.end()) ? *fAllTodosIterator : 0L;

--- kdepim/kpilot/conduits/vcalconduit/vcal-conduit.cc  #1.111:1.112
@@ -146,5 +146,5 @@ KCal::Incidence *VCalConduitPrivate::get
         // Then walk the list until we find an unsynced entry
         while ( fAllEventsIterator != fAllEvents.end() &&
-                e && e->syncStatus()==KCal::Incidence::SYNCNONE && e->pilotId() > 0)
+                e && e->syncStatus()!=KCal::Incidence::SYNCMOD && e->pilotId() > 0)
         {
                 e = (++fAllEventsIterator != fAllEvents.end()) ? *fAllEventsIterator : 0L;


[prev in list] [next in list] [prev in thread] [next in thread]