[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=8cb4a73

The following commit has been merged in the master branch:
commit 8cb4a73e793d08a2ffdc4d835e484b686c0942ab
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue May 26 19:45:56 2015 +0200

    Take into account the profile's serviceName too
---
 plugins/kaccounts/kaccounts-ui-provider.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/kaccounts/kaccounts-ui-provider.cpp b/plugins/kaccounts/kaccounts-ui-provider.cpp
index 39d6b97..881136b 100644
--- a/plugins/kaccounts/kaccounts-ui-provider.cpp
+++ b/plugins/kaccounts/kaccounts-ui-provider.cpp
@@ -184,11 +184,11 @@ void KAccountsUiProvider::onProfileManagerReady(Tp::PendingOperation *op)
     qDebug() << "Creating service for" << d->providerName;
 
     // KDE Talk is a bit special case so special handling needs to be added
-    bool kdeTalk = d->providerName.contains(QStringLiteral("kde-talk"));
+    QString profileService = d->providerName.mid(4);
 
     auto profiles = d->profileManager->profilesForProtocol(d->protocol);
     Q_FOREACH (const Tp::ProfilePtr &profile, profiles) {
-        if (profile->cmName() == d->manager || (kdeTalk && profile->serviceName() == QLatin1String("kde-talk"))) {
+        if (profile->cmName() == d->manager && profile->protocolName() == d->protocol && profileService == profile->serviceName()) {
             d->profile = profile;
             break;
         }

-- 
ktp-accounts-kcm packaging