[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=3278bf3

The following commit has been merged in the master branch:
commit 3278bf304a49b07a34abd95400077479e6fd8135
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Wed Jun 3 09:23:18 2015 +0200

    [kaccounts] Check if KAccount actually exists before usage
---
 kaccounts/kaccounts-ktp-plugin.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/kaccounts/kaccounts-ktp-plugin.cpp b/kaccounts/kaccounts-ktp-plugin.cpp
index 91e4f84..61736aa 100644
--- a/kaccounts/kaccounts-ktp-plugin.cpp
+++ b/kaccounts/kaccounts-ktp-plugin.cpp
@@ -102,6 +102,15 @@ void KAccountsKTpPlugin::Private::migrateTelepathyAccounts()
             migrateLogs(account->objectPath(), kaccountsId);
 
             Accounts::Account *kaccount = KAccounts::accountsManager()->account(kaccountsId);
+            if (!kaccount) {
+                qWarning() << "KAccount for" << kaccountsId << "does not exist, removing it from config";
+                kaccountsKtpGroup.deleteEntry(account->objectPath());
+                KConfigGroup ktpKaccountsGroup = kaccountsConfig->group(QStringLiteral("kaccounts-ktp"));
+                ktpKaccountsGroup.deleteEntry(QString::number(kaccountsId));
+                derefMigrationCount();
+                continue;
+            }
+
             auto services = kaccount->services(QStringLiteral("IM"));
 
             if (services.size() > 0) {

-- 
ktp-common-internals packaging