[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=25f2785

The following commit has been merged in the master branch:
commit 25f2785a51c3ace7a37ef716bc7dc9b05c1c3b2a
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Wed Jun 3 09:24:52 2015 +0200

    [kaccounts] Instead of inc and dec right away, init properly and just dec
---
 kaccounts/kaccounts-ktp-plugin.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kaccounts/kaccounts-ktp-plugin.cpp b/kaccounts/kaccounts-ktp-plugin.cpp
index 61736aa..409b4cb 100644
--- a/kaccounts/kaccounts-ktp-plugin.cpp
+++ b/kaccounts/kaccounts-ktp-plugin.cpp
@@ -90,13 +90,15 @@ void KAccountsKTpPlugin::Private::migrateTelepathyAccounts()
         return;
     }
 
-    Q_FOREACH (const Tp::AccountPtr &account, accountManager->validAccounts()->accounts()) {
+    auto tpAccountsList = accountManager->validAccounts()->accounts();
+    migrationRef = tpAccountsList.size();
+
+    Q_FOREACH (const Tp::AccountPtr &account, tpAccountsList) {
         KConfigGroup kaccountsKtpGroup = kaccountsConfig->group(QStringLiteral("ktp-kaccounts"));
         const Accounts::AccountId kaccountsId = kaccountsKtpGroup.readEntry(account->objectPath(), 0);
 
         qDebug() << "Looking at" << account->objectPath();
         qDebug() << " KAccounts id" << kaccountsId;
-        migrationRef++;
 
         if (kaccountsId != 0) {
             migrateLogs(account->objectPath(), kaccountsId);

-- 
ktp-common-internals packaging