[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=554a361

The following commit has been merged in the master branch:
commit 554a361573959cc73c640d9f25b5a38b02ed9cc4
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Oct 8 12:45:37 2011 +0100

    Only hide fake profiles if the real profile is actually valid.
    
    Reviewed by: Martin Klapetek
---
 src/KCMTelepathyAccounts/profile-list-model.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/KCMTelepathyAccounts/profile-list-model.cpp b/src/KCMTelepathyAccounts/profile-list-model.cpp
index 98ee880..2e1fcc7 100644
--- a/src/KCMTelepathyAccounts/profile-list-model.cpp
+++ b/src/KCMTelepathyAccounts/profile-list-model.cpp
@@ -95,13 +95,18 @@ ProfileItem *ProfileListModel::itemForIndex(const QModelIndex &index) const
 
 bool ProfileListModel::hasNonFakeProfile(const Tp::ProfilePtr& profile, const QList<Tp::ProfilePtr> &profiles) const
 {
+    //loop through all profiles, and look for a non autogenerated profile which matches this name.
     foreach(const Tp::ProfilePtr &otherProfile, profiles) {
         if(profile->protocolName() == otherProfile->protocolName() && !otherProfile->isFake())
         {
             // check if this profile is for a special service or for this protocol in general
             if(otherProfile->serviceName() == otherProfile->cmName().append("-").append(otherProfile->protocolName())
             || otherProfile->serviceName() == otherProfile->protocolName()) {
-                return true;
+                
+                //check we have a valid CM for the non-fake profile
+                if(m_connectionManagerNames.contains(otherProfile->cmName())) {
+                    return true;
+                }
             }
         }
     }

-- 
ktp-accounts-kcm packaging