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

The following commit has been merged in the master branch:
commit aecad8a5831b647fc93e2d0a345782795b2cf655
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Wed Aug 13 14:03:55 2014 +0200

    Add some new enums related to chat rooms to Types.h
    
    This adds some new roles that are needed for the chat-rooms integration in ktp-contactlist to Types.h in KCI, as Martin suggested in the other review (https://git.reviewboard.kde.org/r/118237/)
    
    REVIEW: 119616
---
 KTp/types.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/KTp/types.h b/KTp/types.h
index 3c3f60d..1509772 100644
--- a/KTp/types.h
+++ b/KTp/types.h
@@ -39,7 +39,9 @@ namespace KTp
         PersonRowType,
         AccountRowType,
         GroupRowType,
-        UserRowType
+        RoomRowType,
+        MergeRowType,
+        UserRowType = 1000
     };
 
     enum ContactsModelRole {
@@ -51,6 +53,7 @@ namespace KTp
         //telepathy roles
         ContactRole = Qt::UserRole + 1000,  ///<return Tp::ContactPtr
         AccountRole, ///< return Tp::AccountPtr
+        ChannelRole, ///< return Tp::ChannelPtr
 
         //contact/person roles
         ContactClientTypesRole = Qt::UserRole + 2000, ///< stringlist. See Tp::Contact::ClientTypes
@@ -93,6 +96,7 @@ Q_DECLARE_METATYPE(KTp::ContactPtr)
 Q_DECLARE_METATYPE(Tp::AccountManagerPtr);
 Q_DECLARE_METATYPE(Tp::ConnectionPtr);
 Q_DECLARE_METATYPE(Tp::TextChannelPtr);
+Q_DECLARE_METATYPE(Tp::ChannelPtr);
 
 
 #endif // KTP_TYPES_H

-- 
ktp-common-internals packaging