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

The following commit has been merged in the master branch:
commit f327d39b98c9ecd93663ec5987e6e3e5fe2a2728
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Feb 19 01:00:44 2013 +0100

    When using KTP::Contact, use a KTP::ContactFactory
    
    Otherwise afterwards we have crashes, we don't want crashes.
    
    Reviewed and implemented in parallel by David Edmundson
---
 KTp/Declarative/telepathy-text-observer.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/KTp/Declarative/telepathy-text-observer.cpp b/KTp/Declarative/telepathy-text-observer.cpp
index cf59ce1..6608735 100644
--- a/KTp/Declarative/telepathy-text-observer.cpp
+++ b/KTp/Declarative/telepathy-text-observer.cpp
@@ -26,6 +26,8 @@
 #include <TelepathyQt/ConnectionFactory>
 #include <TelepathyQt/ClientRegistrar>
 
+#include <KTp/contact-factory.h>
+
 
 TelepathyTextObserver::TelepathyTextObserver(QObject *parent) :
     QObject(parent),
@@ -52,7 +54,7 @@ TelepathyTextObserver::TelepathyTextObserver(QObject *parent) :
     channelFactory->addFeaturesForTextChats(textFeatures);
     channelFactory->addFeaturesForTextChatrooms(textFeatures);
 
-    Tp::ContactFactoryPtr contactFactory = Tp::ContactFactory::create(
+    Tp::ContactFactoryPtr contactFactory = KTp::ContactFactory::create(
         Tp::Features() << Tp::Contact::FeatureAlias
                     << Tp::Contact::FeatureAvatarToken
                     << Tp::Contact::FeatureAvatarData

-- 
ktp-common-internals packaging