[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=62024cd

The following commit has been merged in the master branch:
commit 62024cd3d73d6e3cf6cfd5575f5dbef3cb1dbb44
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue Aug 26 18:17:11 2014 +0200

    Make sure the kaccounts entry is removed from the mapping config file
---
 kaccounts/kaccounts-ktp-plugin.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/kaccounts/kaccounts-ktp-plugin.cpp b/kaccounts/kaccounts-ktp-plugin.cpp
index c7c2fe6..2ea652e 100644
--- a/kaccounts/kaccounts-ktp-plugin.cpp
+++ b/kaccounts/kaccounts-ktp-plugin.cpp
@@ -83,6 +83,14 @@ void KAccountsKTpPlugin::onAccountRemoved(const Accounts::AccountId accountId)
         logManager->clearAccountLogs(account);
     }
     account->remove();
+
+    // Delete the entry from config file
+    ktpKaccountsGroup.deleteEntry(QString::number(accountId));
+
+    // As the config file contains mapping both ways (ktp id -> accounts id; accounts id -> ktp id)
+    // we also need to remove the other entry
+    ktpKaccountsGroup = kaccountsConfig->group(QStringLiteral("ktp-kaccounts"));
+    ktpKaccountsGroup.deleteEntry(accountUid);
 }
 
 void KAccountsKTpPlugin::onServiceEnabled(const Accounts::AccountId accountId, const Accounts::Service& service)
@@ -94,4 +102,3 @@ void KAccountsKTpPlugin::onServiceDisabled(const Accounts::AccountId accountId,
 {
 
 }
-

-- 
ktp-common-internals packaging