Several bugfixes

2 files changed, 6 insertions, 2 deletions

diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 56c9801..55ac6d4 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -587,12 +587,16 @@ QDateTime Incidence::getNextOccurence( const QDateTime& dt, bool* ok ) const
          } else {
              return QDateTime ();
          }
     } else {
         if ( hasStartDate () ) {
             incidenceStart = dtStart(); 
+        }
+        if ( type() =="Todo" ) {
+            if ( ((Todo*)this)->hasDueDate() )
+                incidenceStart = ((Todo*)this)->dtDue();
             
         } 
     }
     if ( incidenceStart > dt )
         *ok = true;
     return incidenceStart;
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index 64a343c..b36dc1a 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -268,13 +268,13 @@ Attendee *IncidenceBase::getAttendee(const char *n) const
 Attendee *IncidenceBase::attendeeByMail(const QString &email)
 {
   QPtrListIterator<Attendee> qli(mAttendees);
 
   qli.toFirst();
   while (qli) {
-    if (qli.current()->email() == email)
+      if (qli.current()->email().lower() == email.lower())
       return qli.current();
     ++qli;
   }
   return 0L;
 }
 
@@ -286,13 +286,13 @@ Attendee *IncidenceBase::attendeeByMails(const QStringList &emails, const QStrin
   if (!email.isEmpty()) {
     mails.append(email);
   }
   qli.toFirst();
   while (qli) {
     for ( QStringList::Iterator it = mails.begin(); it != mails.end(); ++it ) {
-      if (qli.current()->email() == *it)
+        if (qli.current()->email().lower() == (*it).lower())
         return qli.current();
      }
 
     ++qli;
   }
   return 0L;