[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=a5f7989

The following commit has been merged in the master branch:
commit a5f7989e6f588ba265701f020d600989b7d21823
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Sun Apr 13 23:32:36 2014 +0200

    Add contacts only from valid accounts
    
    Reviewed-by: David Edmundson
    BUG: 318364
    FIXED-IN: 0.8.1
---
 KTp/Models/accounts-tree-proxy-model.cpp | 8 +++++---
 KTp/global-contact-manager.cpp           | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/KTp/Models/accounts-tree-proxy-model.cpp b/KTp/Models/accounts-tree-proxy-model.cpp
index c600294..eae3eac 100644
--- a/KTp/Models/accounts-tree-proxy-model.cpp
+++ b/KTp/Models/accounts-tree-proxy-model.cpp
@@ -103,9 +103,11 @@ void KTp::AccountsTreeProxyModel::onAccountChanged()
 
 void KTp::AccountsTreeProxyModel::onAccountAdded(const Tp::AccountPtr &account)
 {
-    forceGroup(account->objectPath());
-    connect(account.data(), SIGNAL(normalizedNameChanged(QString)), SLOT(onAccountChanged()));
-    connect(account.data(), SIGNAL(iconNameChanged(QString)), SLOT(onAccountChanged()));
+    if (account->isValidAccount()) {
+        forceGroup(account->objectPath());
+        connect(account.data(), SIGNAL(normalizedNameChanged(QString)), SLOT(onAccountChanged()));
+        connect(account.data(), SIGNAL(iconNameChanged(QString)), SLOT(onAccountChanged()));
+    }
 }
 
 void KTp::AccountsTreeProxyModel::onAccountRemoved(const Tp::AccountPtr &account)
diff --git a/KTp/global-contact-manager.cpp b/KTp/global-contact-manager.cpp
index fb69bd2..e2533e9 100644
--- a/KTp/global-contact-manager.cpp
+++ b/KTp/global-contact-manager.cpp
@@ -82,8 +82,10 @@ void GlobalContactManager::onAccountManagerReady(Tp::PendingOperation *op)
 
 void GlobalContactManager::onNewAccount(const Tp::AccountPtr &account)
 {
-    onConnectionChanged(account->connection());
-    connect(account.data(), SIGNAL(connectionChanged(Tp::ConnectionPtr)), SLOT(onConnectionChanged(Tp::ConnectionPtr)));
+    if (account->isValidAccount()) {
+        onConnectionChanged(account->connection());
+        connect(account.data(), SIGNAL(connectionChanged(Tp::ConnectionPtr)), SLOT(onConnectionChanged(Tp::ConnectionPtr)));
+    }
 }
 
 

-- 
ktp-common-internals packaging