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

The following commit has been merged in the master branch:
commit cac89edd519758c1695b24c3b922a29f36a5b3f0
Author: Aleix Pol <aleixpol at kde.org>
Date:   Sun Apr 13 15:35:29 2014 +0200

    Register all the types!
---
 KTp/Declarative/qml-plugins.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/KTp/Declarative/qml-plugins.cpp b/KTp/Declarative/qml-plugins.cpp
index 2ab65d5..74b5b0c 100644
--- a/KTp/Declarative/qml-plugins.cpp
+++ b/KTp/Declarative/qml-plugins.cpp
@@ -33,6 +33,7 @@
 #include "filtered-pinned-contacts-proxy-model.h"
 #include "telepathy-manager.h"
 
+#include <TelepathyQt/PendingChannelRequest>
 #include "KTp/types.h"
 #include "KTp/Models/contacts-filter-model.h"
 #include "KTp/Models/contacts-model.h"
@@ -64,6 +65,7 @@ void QmlPlugins::registerTypes(const char *uri)
 
     qmlRegisterType<TelepathyManager>();
     qmlRegisterType<ConversationsModel>();
+    qmlRegisterType<Tp::PendingChannelRequest>();
     qRegisterMetaType<Tp::AccountManagerPtr>();
     qRegisterMetaType<KTp::ContactPtr>();
     qRegisterMetaType<Tp::AccountPtr>();

-- 
ktp-common-internals packaging