commit eb28c54928d92cf8e82640adc1d82ca16311ef59
Author: Sergio Martins <iamsergio@gmail.com>
Date:   Fri May 13 10:33:29 2011 +0100

    Always check legacy kres for migration.
    
    Patch by Volker.
    
    BUG: 270631

diff --git a/akonadi/firstrun.cpp b/akonadi/firstrun.cpp
index 754128e..ea9507f 100644
--- a/akonadi/firstrun.cpp
+++ b/akonadi/firstrun.cpp
@@ -85,6 +85,11 @@ void Firstrun::findPendingDefaults()
       mPendingDefaults << dirName + fileName;
     }
   }
+
+#ifndef KDEPIM_NO_KRESOURCES
+  // always check legacy kres for migration, their migrator might have changed again
+  mPendingKres << QLatin1String("contact") << QLatin1String("calendar");
+#endif
 }
 
 #ifndef KDEPIM_NO_KRESOURCES
@@ -155,6 +160,12 @@ void Firstrun::setupNext()
   mCurrentDefault = 0;
 
   if ( mPendingDefaults.isEmpty() ) {
+#ifndef KDEPIM_NO_KRESOURCES
+    if ( !mPendingKres.isEmpty() ) {
+      migrateKresType( mPendingKres.takeFirst() );
+      return;
+    }
+#endif
     deleteLater();
     return;
   }
@@ -192,7 +203,7 @@ void Firstrun::setupNext()
       KConfigGroup cfg( mConfig, "ProcessedDefaults" );
       cfg.writeEntry( agentCfg.readEntry( "Id", QString() ), QString::fromLatin1( "kres" ) );
       cfg.sync();
-      migrateKresType( kresType );
+      setupNext();
       return;
     }
   }
diff --git a/akonadi/firstrun_p.h b/akonadi/firstrun_p.h
index 8072669..81fbbf2 100644
--- a/akonadi/firstrun_p.h
+++ b/akonadi/firstrun_p.h
@@ -91,6 +91,7 @@ class Firstrun : public QObject
     KConfig *mCurrentDefault;
     KProcess *mProcess;
 #ifndef KDEPIM_NO_KRESOURCES
+    QStringList mPendingKres;
     QString mResourceFamily;
 #endif
 };