[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=8cde791

The following commit has been merged in the master branch:
commit 8cde791d92632430c8286d7fa1c95f9b182bd0a7
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Jan 30 23:31:57 2012 +0000

    Fix duplication of messages model
---
 KTp/Declarative/messages-model.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/KTp/Declarative/messages-model.h b/KTp/Declarative/messages-model.h
index 7467f57..8da3626 100644
--- a/KTp/Declarative/messages-model.h
+++ b/KTp/Declarative/messages-model.h
@@ -20,14 +20,12 @@
 #ifndef MESSAGES_MODEL_H
 #define MESSAGES_MODEL_H
 
-#include "ktpchat_export.h"
-
 #include <QAbstractItemModel>
 #include <TelepathyQt/TextChannel>
 #include "conversation-que-manager.h"
 
 
-class KDE_TELEPATHY_CHAT_EXPORT MessagesModel : public QAbstractListModel, public Queable
+class MessagesModel : public QAbstractListModel, public Queable
 {
     Q_OBJECT
     Q_PROPERTY(bool visibleToUser READ isVisibleToUser WRITE setVisibleToUser NOTIFY visibleToUserChanged);

-- 
ktp-common-internals packaging