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

List:       kde-commits
Subject:    branches/KDE/4.5/kdepim/runtime/resources/mixedmaildir
From:       Kevin Krammer <kevin.krammer () gmx ! at>
Date:       2010-07-23 13:55:22
Message-ID: 20100723135522.48431AC7AB () svn ! kde ! org
[Download RAW message or body]

SVN commit 1153556 by krake:

Deleting a collection does not invalidate the parent's index because the change is in \
the parent's sub folder directory and the index validation check does not check its \
timestamp


 M  +0 -2      mixedmaildirresource.cpp  
 M  +0 -42     mixedmaildirstore.cpp  


--- branches/KDE/4.5/kdepim/runtime/resources/mixedmaildir/mixedmaildirresource.cpp \
#1153555:1153556 @@ -702,8 +702,6 @@
   Q_ASSERT( colJob != 0 );
 
   changeCommitted( colJob->collection() );
-
-  checkForInvalidatedIndexCollections( job );
 }
 
 void MixedMaildirResource::compactStore( const QVariant &arg )
--- branches/KDE/4.5/kdepim/runtime/resources/mixedmaildir/mixedmaildirstore.cpp \
#1153555:1153556 @@ -881,43 +881,6 @@
     return false;
   }
 
-  bool parentIndexInvalidated = false;
-  if ( parentFolderType == MBoxFolder ) {
-    MBoxPtr mboxPtr;
-    MBoxHash::const_iterator mboxIt = mMBoxes.constFind( parentPath );
-    if ( mboxIt == mMBoxes.constEnd() ) {
-      kError() << "Deleting folder" << path << "from parent MBox" << parentPath
-               << "but there is no context for that MBox yet";
-
-      mboxPtr = MBoxPtr( new MBoxContext );
-      if ( !mboxPtr->load( parentPath ) ) {
-        kError() << "Loading of parent MBox" << parentPath << "failed";
-      }
-
-      mMBoxes.insert( parentPath, mboxPtr );
-    } else {
-      mboxPtr = mboxIt.value();
-    }
-
-    mboxPtr->readIndexData();
-    parentIndexInvalidated = mboxPtr->hasIndexData();
-  } else if ( parentFolderType == MaildirFolder ) {
-    MaildirPtr mdPtr;
-    MaildirHash::const_iterator mdIt = mMaildirs.constFind( parentPath );
-    if ( mdIt == mMaildirs.constEnd() ) {
-      kError() << "Deleting folder" << path << "from parent Maildir" << parentPath
-               << "but there is no context for that Maildir yet";
-
-      mdPtr = MaildirPtr( new MaildirContext( parentPath, false ) );
-      mMaildirs.insert( parentPath, mdPtr );
-    } else {
-      mdPtr = mdIt.value();
-    }
-
-    mdPtr->readIndexData();
-    parentIndexInvalidated = mdPtr->hasIndexData();
-  }
-
   if ( folderType == MBoxFolder ) {
     if ( !QFile::remove( path ) ) {
       errorText = i18nc( "@info:status", "Cannot remove folder %1 from folder %2",
@@ -939,11 +902,6 @@
   const QString subDirPath = Maildir::subDirPathForFolderPath( path );
   KPIMUtils::removeDirAndContentsRecursively( subDirPath );
 
-  if ( parentIndexInvalidated ) {
-    const QVariant var = QVariant::fromValue<Collection::List>( Collection::List() \
                << job->collection().parentCollection() );
-    job->setProperty( "onDiskIndexInvalidated", var );
-  }
-
   q->notifyCollectionsProcessed( Collection::List() << job->collection() );
   return true;
 }


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