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

List:       kde-commits
Subject:    [kdepim] backupmail: Load identity
From:       Montel Laurent <montel () kde ! org>
Date:       2012-05-15 11:38:05
Message-ID: 20120515113805.9348EA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 74c32eff516ebbbb5dbca2aff66d034100b5c5b7 by Montel Laurent.
Committed on 15/05/2012 at 13:37.
Pushed by mlaurent into branch 'master'.

Load identity

M  +10   -5    backupmail/restoredata.cpp
M  +1    -1    backupmail/restoredata.h

http://commits.kde.org/kdepim/74c32eff516ebbbb5dbca2aff66d034100b5c5b7

diff --git a/backupmail/restoredata.cpp b/backupmail/restoredata.cpp
index dfa00ec..8fa4b4e 100644
--- a/backupmail/restoredata.cpp
+++ b/backupmail/restoredata.cpp
@@ -23,6 +23,8 @@
 
 #include "messageviewer/kcursorsaver.h"
 
+#include <kpimidentities/identitymanager.h>
+#include <kpimidentities/identity.h>
 #include <KZip>
 #include <KLocale>
 #include <KTemporaryFile>
@@ -151,10 +153,10 @@ void RestoreData::restoreIdentity()
     const QStringList identityList = identityConfig->groupList().filter( QRegExp( "Identity #\\d+" ) );
     Q_FOREACH(const QString&identityStr, identityList) {
       KConfigGroup group = identityConfig->group(identityStr);
-      QString oldUid;
+      uint oldUid = -1;
       const QString uidStr("uoid");
       if(group.hasKey(uidStr)) {
-        oldUid = group.readEntry(uidStr);
+        oldUid = group.readEntry(uidStr).toUInt();
         group.deleteEntry(uidStr);
       }
       const QString fcc(QLatin1String("Fcc"));
@@ -170,10 +172,13 @@ void RestoreData::restoreIdentity()
         group.writeEntry(templates,adaptFolderId(group.readEntry(templates)));
       }
       group.sync();
-      //Save new Id
-    }
+      KPIMIdentities::Identity* identity = &mIdentityManager->newFromScratch( QString() );
 
-    //TODO
+      identity->readConfig(group);
+      if(oldUid != -1) {
+        mHashIdentity.insert(oldUid,identity->uoid());
+      }
+    }
     Q_EMIT info(i18n("Identities restored."));
   } else {
     Q_EMIT error(i18n("Failed to restore identity file."));
diff --git a/backupmail/restoredata.h b/backupmail/restoredata.h
index 505aabd..40c84b4 100644
--- a/backupmail/restoredata.h
+++ b/backupmail/restoredata.h
@@ -40,7 +40,7 @@ private:
   void restoreAkonadiDb();
   void restoreNepomuk();
   Akonadi::Collection::Id adaptFolderId( const QString& folder);
-  QHash<QString, QString> mHashIdentity;
+  QHash<uint, uint> mHashIdentity;
   QHash<QString, QString> mHashTransport;
   QHash<QString, QString> mHashResources;
   QStringList mFileList;
[prev in list] [next in list] [prev in thread] [next in thread]