[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=21dffc4

The following commit has been merged in the master branch:
commit 21dffc44ea0bb311e9a936fca6b63fb232f35f31
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue Jun 2 15:34:38 2015 +0200

    [kaccounts] Make the debug output more useful
---
 kaccounts/kaccounts-ktp-plugin.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/kaccounts/kaccounts-ktp-plugin.cpp b/kaccounts/kaccounts-ktp-plugin.cpp
index 2751b38..74bf52c 100644
--- a/kaccounts/kaccounts-ktp-plugin.cpp
+++ b/kaccounts/kaccounts-ktp-plugin.cpp
@@ -124,15 +124,16 @@ void KAccountsKTpPlugin::Private::migrateTelepathyAccounts()
 void KAccountsKTpPlugin::onStorageProviderRetrieved(Tp::PendingOperation *op)
 {
     const QString storageProvider = qobject_cast<Tp::PendingVariant*>(op)->result().toString();
+    const QString accountObjectPath = op->property("accountObjectPath").toString();
     if (storageProvider == QLatin1String("im.telepathy.Account.Storage.AccountsSSO")) {
-        qDebug() << "Found Tp Account with AccountsSSO provider, skipping...";
+        qDebug() << "Found Tp Account" << accountObjectPath << "with AccountsSSO provider, skipping...";
         return;
     }
 
-    qDebug() << "No KAccounts id, creating new account";
+    qDebug() << "Creating new KAccounts account for" << accountObjectPath;
     Accounts::Account *kaccount;
 
-    Tp::AccountPtr account = d->accountManager->accountForObjectPath(op->property("accountObjectPath").toString());
+    Tp::AccountPtr account = d->accountManager->accountForObjectPath(accountObjectPath);
 
     if (account.isNull() || !account->isValid()) {
         qDebug() << "An invalid Tp Account retrieved, aborting...";
@@ -204,6 +205,7 @@ void KAccountsKTpPlugin::Private::migrateLogs(const QString &tpAccountId, const
     Tp::AccountPtr tpAccount = accountManager->accountForObjectPath(tpAccountId);
 
     if (tpAccount.isNull() || !tpAccount->isValid()) {
+        qDebug() << "Invalid account for" << tpAccountId << "aborting...";
         return;
     }
 

-- 
ktp-common-internals packaging