[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-10 20:51:58
Message-ID: 20050410205158.2C48C495 () office ! kde ! org
[Download RAW message or body]

CVS commit by adridg: 

Fix from Philip, now both sides make sense


  M +2 -2      todo-conduit.cc   1.59
  M +2 -3      vcal-conduit.cc   1.110


--- kdepim/kpilot/conduits/vcalconduit/todo-conduit.cc  #1.58:1.59
@@ -143,5 +143,4 @@ KCal::Incidence *TodoConduitPrivate::get
                 reading=true;
                 fAllTodosIterator = fAllTodos.begin();
-                if ( fAllTodosIterator != fAllTodos.end() ) e=*fAllTodosIterator;
         }
         else
@@ -149,4 +148,5 @@ KCal::Incidence *TodoConduitPrivate::get
                 ++fAllTodosIterator;
         }
+        if ( fAllTodosIterator != fAllTodos.end() ) e=*fAllTodosIterator;
         while (fAllTodosIterator != fAllTodos.end() &&
                 e && e->syncStatus()!=KCal::Incidence::SYNCMOD)

--- kdepim/kpilot/conduits/vcalconduit/vcal-conduit.cc  #1.109:1.110
@@ -148,6 +148,5 @@ KCal::Incidence *VCalConduitPrivate::get
                 e && e->syncStatus()==KCal::Incidence::SYNCNONE && e->pilotId() > 0)
         {
-                ++fAllEventsIterator;
-                e=*fAllEventsIterator;
+                e = (++fAllTodosIterator != fAllTodos.end()) ? *fAllTodosIterator : 0L;
         }
         return (fAllEventsIterator == fAllEvents.end()) ? 0L :  *fAllEventsIterator;


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