Branch 'kolab/integration/4.13.0' - 2 commits - akonadi/firstrun.cpp

Christian Mollekopf mollekopf at kolabsys.com
Wed Nov 12 14:29:58 CET 2014


 akonadi/firstrun.cpp |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit c360b8df95a94a58fa17189f740e813ffa4e41df
Merge: 5d2c80d 5ca8aa9
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date:   Wed Nov 12 14:28:03 2014 +0100

    Merge remote-tracking branch 'kolab/dev/fix_create_resources_twice' into kolab/integration/4.13.0



commit 5ca8aa965f4dfeb56a8f94472741eb859edb479f
Author: Sandro Knauß <knauss at kolabsys.com>
Date:   Wed Nov 12 12:23:35 2014 +0100

    Firstrun: Do not create Resources twice.
    
    If the Firstrun agent finds the same file in different folders, than it
    should only create the resource once.
    
    KOLAB: 3872

diff --git a/akonadi/firstrun.cpp b/akonadi/firstrun.cpp
index 8761ccc..5730209 100644
--- a/akonadi/firstrun.cpp
+++ b/akonadi/firstrun.cpp
@@ -77,10 +77,15 @@ Firstrun::~Firstrun()
 void Firstrun::findPendingDefaults()
 {
     const KConfigGroup cfg(mConfig, "ProcessedDefaults");
+    QSet<QString> defaults;
     foreach (const QString &dirName, KGlobal::dirs()->findDirs("data", QLatin1String("akonadi/firstrun"))) {
         const QStringList files = QDir(dirName).entryList(QDir::Files | QDir::Readable);
         foreach (const QString &fileName, files) {
             const QString fullName = dirName + fileName;
+            if (defaults.contains(fileName)) {
+                continue;
+            }
+            defaults.insert(fileName);
             KConfig c(fullName);
             const QString id = KConfigGroup(&c, "Agent").readEntry("Id", QString());
             if (id.isEmpty()) {




More information about the commits mailing list