[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=b4006f8

The following commit has been merged in the master branch:
commit b4006f84be8ea7ce1d4be5410e1304a1f3fa90bd
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Feb 26 01:44:46 2013 +0000

    Fix crash in contact applet
    
    BUG: 315786
    FIXED-IN: 0.6.0
    
    Reviewed-by: Aleix Pol
---
 contact/src/telepathy-contact.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/contact/src/telepathy-contact.cpp b/contact/src/telepathy-contact.cpp
index 6403e91..9db8217 100644
--- a/contact/src/telepathy-contact.cpp
+++ b/contact/src/telepathy-contact.cpp
@@ -36,6 +36,7 @@
 #include <TelepathyQt/PendingReady>
 #include <TelepathyQt/Types>
 
+#include <KTp/contact-factory.h>
 
 TelepathyContact::TelepathyContact(QObject* parent, const QVariantList& args)
     : Plasma::Applet(parent, args)
@@ -191,7 +192,7 @@ void TelepathyContact::setupAccountManager()
                                                                                << Tp::Connection::FeatureRosterGroups
                                                                                << Tp::Connection::FeatureRoster);
 
-    Tp::ContactFactoryPtr contactFactory = Tp::ContactFactory::create(Tp::Features()
+    Tp::ContactFactoryPtr contactFactory = KTp::ContactFactory::create(Tp::Features()
                                                                       << Tp::Contact::FeatureAlias
                                                                       << Tp::Contact::FeatureAvatarData
                                                                       << Tp::Contact::FeatureSimplePresence

-- 
ktp-contact-applet packaging