[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=0f4237f

The following commit has been merged in the master branch:
commit 0f4237f52334ff51c49235780bfb6b8102a53a27
Merge: 01040af62d3af84372a29b4bb69eb7df05cbcec3 7584346f3a44afdf1ceabdb5233e2b39ac50e079
Author: Aleix Pol <aleixpol at kde.org>
Date:   Sun Apr 13 23:47:20 2014 +0200

    Merge branch 'master' into frameworks
    
    Conflicts:
    	KTp/Declarative/qml-plugins.cpp

 KTp/Declarative/qml-plugins.cpp |  7 +++++--
 KTp/Declarative/qmldir          |  4 +++-
 KTp/Models/presence-model.cpp   | 22 ++++++++++++++++++++--
 KTp/Models/presence-model.h     | 11 ++++++++---
 KTp/global-presence.cpp         |  2 +-
 KTp/global-presence.h           |  3 ++-
 6 files changed, 39 insertions(+), 10 deletions(-)

diff --cc KTp/Declarative/qml-plugins.cpp
index 0777249,acac9e9..31153ae
--- a/KTp/Declarative/qml-plugins.cpp
+++ b/KTp/Declarative/qml-plugins.cpp
@@@ -32,9 -33,9 +32,10 @@@
  #include "filtered-pinned-contacts-proxy-model.h"
  #include "telepathy-manager.h"
  
 +#include <TelepathyQt/PendingChannelRequest>
  #include "KTp/types.h"
  #include "KTp/global-presence.h"
+ #include "KTp/Models/presence-model.h"
  #include "KTp/Models/contacts-filter-model.h"
  #include "KTp/Models/contacts-model.h"
  #include "KTp/Models/accounts-list-model.h"
@@@ -63,11 -65,12 +66,11 @@@ void QmlPlugins::registerTypes(const ch
      qmlRegisterUncreatableType<MessagesModel> (uri, 0, 1, "MessagesModel",
          QLatin1String("It will be created once the conversation is created"));
  
-     qmlRegisterType<KTp::GlobalPresence> (uri, 0, 1, "GlobalPresence");
- 
      qmlRegisterType<TelepathyManager>();
      qmlRegisterType<ConversationsModel>();
 -
      qmlRegisterType<Tp::PendingChannelRequest>();
+     qRegisterMetaType<Tp::Presence>();
+     qRegisterMetaType<KTp::Presence>();
      qRegisterMetaType<Tp::AccountManagerPtr>();
      qRegisterMetaType<KTp::ContactPtr>();
      qRegisterMetaType<Tp::AccountPtr>();

-- 
ktp-common-internals packaging