author | zautrix <zautrix> | 2004-09-20 15:25:04 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-20 15:25:04 (UTC) |
commit | 6b6a28919908134ccbb3badcb24c2dcae0d426a5 (patch) (unidiff) | |
tree | 72b3f69fa1f40bd4cfbd945d9f41699229604ae6 /libkcal | |
parent | f222bd1339ac8323e3c99af84a6f83c21cacb8f8 (diff) | |
download | kdepimpi-6b6a28919908134ccbb3badcb24c2dcae0d426a5.zip kdepimpi-6b6a28919908134ccbb3badcb24c2dcae0d426a5.tar.gz kdepimpi-6b6a28919908134ccbb3badcb24c2dcae0d426a5.tar.bz2 |
Several bugfixes
-rw-r--r-- | libkcal/incidence.cpp | 8 | ||||
-rw-r--r-- | libkcal/incidencebase.cpp | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp index 56c9801..55ac6d4 100644 --- a/libkcal/incidence.cpp +++ b/libkcal/incidence.cpp | |||
@@ -590,8 +590,12 @@ QDateTime Incidence::getNextOccurence( const QDateTime& dt, bool* ok ) const | |||
590 | } else { | 590 | } else { |
591 | if ( hasStartDate () ) { | 591 | if ( hasStartDate () ) { |
592 | incidenceStart = dtStart(); | 592 | incidenceStart = dtStart(); |
593 | 593 | } | |
594 | } | 594 | if ( type() =="Todo" ) { |
595 | if ( ((Todo*)this)->hasDueDate() ) | ||
596 | incidenceStart = ((Todo*)this)->dtDue(); | ||
597 | |||
598 | } | ||
595 | } | 599 | } |
596 | if ( incidenceStart > dt ) | 600 | if ( incidenceStart > dt ) |
597 | *ok = true; | 601 | *ok = true; |
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp index 64a343c..b36dc1a 100644 --- a/libkcal/incidencebase.cpp +++ b/libkcal/incidencebase.cpp | |||
@@ -271,7 +271,7 @@ Attendee *IncidenceBase::attendeeByMail(const QString &email) | |||
271 | 271 | ||
272 | qli.toFirst(); | 272 | qli.toFirst(); |
273 | while (qli) { | 273 | while (qli) { |
274 | if (qli.current()->email() == email) | 274 | if (qli.current()->email().lower() == email.lower()) |
275 | return qli.current(); | 275 | return qli.current(); |
276 | ++qli; | 276 | ++qli; |
277 | } | 277 | } |
@@ -289,7 +289,7 @@ Attendee *IncidenceBase::attendeeByMails(const QStringList &emails, const QStrin | |||
289 | qli.toFirst(); | 289 | qli.toFirst(); |
290 | while (qli) { | 290 | while (qli) { |
291 | for ( QStringList::Iterator it = mails.begin(); it != mails.end(); ++it ) { | 291 | for ( QStringList::Iterator it = mails.begin(); it != mails.end(); ++it ) { |
292 | if (qli.current()->email() == *it) | 292 | if (qli.current()->email().lower() == (*it).lower()) |
293 | return qli.current(); | 293 | return qli.current(); |
294 | } | 294 | } |
295 | 295 | ||