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

The following commit has been merged in the master branch:
commit c95af2411f57be218bac404c09c885183a4e92e3
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Nov 9 12:03:37 2012 +0100

    Make TelepathyLoggerQt4 a hard dependency
    
    BUG: 307212
    FIXED-IN: 0.6.0
---
 KTp/message.cpp | 2 --
 KTp/message.h   | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/KTp/message.cpp b/KTp/message.cpp
index 451143c..aa7de9d 100644
--- a/KTp/message.cpp
+++ b/KTp/message.cpp
@@ -28,7 +28,6 @@ Message::Message(const Tp::Message &original) :
     setMainMessagePart(original.text());
 }
 
-#ifdef TELEPATHY_LOGGER_QT4_FOUND
 Message::Message(const Tpl::TextEventPtr &original) :
     m_sentTime(original->timestamp()),
     m_token(original->messageToken()),
@@ -36,7 +35,6 @@ Message::Message(const Tpl::TextEventPtr &original) :
 {
     setMainMessagePart(original->message());
 }
-#endif
 
 QString Message::mainMessagePart() const
 {
diff --git a/KTp/message.h b/KTp/message.h
index c420f5d..1928fcd 100644
--- a/KTp/message.h
+++ b/KTp/message.h
@@ -22,10 +22,8 @@
 
 #include <TelepathyQt/Message>
 
-#ifdef TELEPATHY_LOGGER_QT4_FOUND
 #include <TelepathyLoggerQt4/Types>
 #include <TelepathyLoggerQt4/TextEvent>
-#endif
 
 #include <ktpchat_export.h>
 
@@ -48,10 +46,7 @@ class KDE_TELEPATHY_CHAT_EXPORT Message {
 
 public:
     Message(const Tp::Message& original);
-
-#ifdef TELEPATHY_LOGGER_QT4_FOUND
     Message(const Tpl::TextEventPtr &original);
-#endif
 
     /*! rief The body of the message
      * 
eturn the contents of the body of the message, as HTML

-- 
ktp-common-internals packaging