[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=265a352

The following commit has been merged in the master branch:
commit 265a352a1832f920950777e75400f6f1fbf7e72b
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Fri Apr 11 17:21:26 2014 +0200

    Match contacts in watcher proxy by contact id instead of ContactPtr
    
    CCBUG: 320570
---
 KTp/Models/text-channel-watcher-proxy-model.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KTp/Models/text-channel-watcher-proxy-model.cpp b/KTp/Models/text-channel-watcher-proxy-model.cpp
index 8a82b58..7171697 100644
--- a/KTp/Models/text-channel-watcher-proxy-model.cpp
+++ b/KTp/Models/text-channel-watcher-proxy-model.cpp
@@ -157,7 +157,7 @@ void KTp::TextChannelWatcherProxyModel::observeChannels(const Tp::MethodInvocati
             }
 
             //if it's not in our source model, ignore the channel
-            QModelIndexList matchedContacts = sourceModel()->match(QModelIndex(sourceModel()->index(0,0)), KTp::ContactRole, QVariant::fromValue(targetContact));
+            QModelIndexList matchedContacts = sourceModel()->match(QModelIndex(sourceModel()->index(0,0)), KTp::IdRole, QVariant::fromValue(targetContact->id()));
             if (matchedContacts.size() !=1) {
                 continue;
             }

-- 
ktp-common-internals packaging