1 files changed, 10 insertions, 1 deletions

diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index b02f706..ad8ace3 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -80,12 +80,15 @@ bool CalendarLocal::mergeCalendarFile( QString name )
     return false;
 }
  
-Incidence* CalendarLocal::incidenceForUid( const QString& uid , bool doNotCheckDuplicates) 
+Incidence* CalendarLocal::incidenceForUid( const QString& uid , bool doNotCheckDuplicates, bool enabledOnly ) 
 {
     Todo *todo;;
     Incidence *retVal = 0;
     for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
         if ( todo->uid() == uid ) {
+            if ( enabledOnly )
+                if ( !todo->calEnabled() )
+                    continue;
             if ( doNotCheckDuplicates ) return todo;
             if ( retVal ) {
                 if ( retVal->calID() > todo->calID() ) {
@@ -100,6 +103,9 @@ Incidence* CalendarLocal::incidenceForUid( const QString& uid , bool doNotCheckD
     Event *event;
     for ( event = mEventList.first(); event; event = mEventList.next() ) {
         if (  event->uid() == uid ) {
+            if ( enabledOnly )
+                if ( !event->calEnabled() )
+                    continue;
             if ( doNotCheckDuplicates ) return event;
             if ( retVal ) {
                 if ( retVal->calID() > event->calID() ) {
@@ -113,6 +119,9 @@ Incidence* CalendarLocal::incidenceForUid( const QString& uid , bool doNotCheckD
     if ( retVal ) return retVal;
     for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
         if ( it->uid() == uid ) {
+            if ( enabledOnly )
+                if ( !it->calEnabled() )
+                    continue;
             if ( doNotCheckDuplicates ) return it;
             if ( retVal ) {
                 if ( retVal->calID() > it->calID() ) {