2 files changed, 16 insertions, 10 deletions

diff --git a/libopie/pim/otodoaccessxml.cpp b/libopie/pim/otodoaccessxml.cpp
index 7a55c67..385fd27 100644
--- a/libopie/pim/otodoaccessxml.cpp
+++ b/libopie/pim/otodoaccessxml.cpp
@@ -116,7 +116,15 @@ bool OTodoAccessXML::load() {
         /*
          * now add it
          */
+        if (m_events.contains( ev.uid() ) || ev.uid() == 0) {
+            ev.setUid( 1 );
+            m_changed = true;
+        }
+        if ( ev.hasDueDate() ) {
+            ev.setDueDate( QDate(m_year, m_month, m_day) );
+        }
         m_events.insert(ev.uid(), ev );
+        m_year = m_month = m_day = -1;
     }
 
     qWarning("counts %d records loaded!", m_events.count() );
@@ -339,11 +347,6 @@ void OTodoAccessXML::todo( QAsciiDict<int>* dict, OTodo& ev,
     default:
         break;
     }
-
-    if ( ev.hasDueDate() ) {
-        QDate date( m_year,  m_month, m_day );
-        ev.setDueDate( date );
-    }
 }
 QString OTodoAccessXML::toString( const OTodo& ev )const {
     QString str;
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp
index 7a55c67..385fd27 100644
--- a/libopie2/opiepim/backend/otodoaccessxml.cpp
+++ b/libopie2/opiepim/backend/otodoaccessxml.cpp
@@ -116,7 +116,15 @@ bool OTodoAccessXML::load() {
         /*
          * now add it
          */
+        if (m_events.contains( ev.uid() ) || ev.uid() == 0) {
+            ev.setUid( 1 );
+            m_changed = true;
+        }
+        if ( ev.hasDueDate() ) {
+            ev.setDueDate( QDate(m_year, m_month, m_day) );
+        }
         m_events.insert(ev.uid(), ev );
+        m_year = m_month = m_day = -1;
     }
 
     qWarning("counts %d records loaded!", m_events.count() );
@@ -339,11 +347,6 @@ void OTodoAccessXML::todo( QAsciiDict<int>* dict, OTodo& ev,
     default:
         break;
     }
-
-    if ( ev.hasDueDate() ) {
-        QDate date( m_year,  m_month, m_day );
-        ev.setDueDate( date );
-    }
 }
 QString OTodoAccessXML::toString( const OTodo& ev )const {
     QString str;