[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=47f635f

The following commit has been merged in the master branch:
commit 47f635f515c51be90d27dbd6be923a569a18cc27
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Jul 25 23:02:27 2013 +0200

    Make TelepathyLoggerQt an optional dependency
    
    REVIEW: 111684
---
 CMakeLists.txt          | 23 +++++++++++++++++------
 contact-list-widget.cpp | 16 +++++++++-------
 context-menu.cpp        |  8 ++++++++
 context-menu.h          |  4 ++++
 4 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb22ccd..43be2ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,10 +12,11 @@ set(KDE_MIN_VERSION "4.4.75")
 find_package (KDE4 4.4.75 REQUIRED)
 find_package (TelepathyQt4 0.9.3 REQUIRED)
 find_package (KTp REQUIRED)
-find_package (TelepathyLoggerQt4 0.5.60 REQUIRED)
+find_package (TelepathyLoggerQt4 0.5.60 QUIET)
 find_package (KPeople QUIET)
 
 macro_log_feature(KPEOPLE_FOUND "KPeople" "Support for KDE Contact Aggregation" "https://projects.kde.org/libkpeople" FALSE "" "")
+macro_log_feature(TELEPATHY_LOGGER_QT4_FOUND "TelepatyLoggerQt4" "Qt bindings for TelepathyLogger. This is needed to provide access to chat logs. HIGHLY recommended" "http://projects.kde.org/telepathy-logger-qt" FALSE "" "")
 macro_display_feature_log()
 
 if (KPEOPLE_FOUND)
@@ -23,16 +24,19 @@ if (KPEOPLE_FOUND)
     include_directories(${KPEOPLE_INCLUDES})
 endif (KPEOPLE_FOUND)
 
+if (TELEPATHY_LOGGER_QT4_FOUND)
+    add_definitions(${TELEPATHY_LOGGER_QT4_DEFINITIONS} -DHAVE_TPLOGGERQT)
+    include_directories(${TELEPATHY_LOGGER_QT4_INCLUDE_DIRS})
+endif (TELEPATHY_LOGGER_QT4_FOUND)
+
+
 include (KDE4Defaults)
 include (MacroLibrary)
 
-add_definitions (${KDE4_DEFINITIONS}
-                 ${TELEPATHY_LOGGER_QT4_DEFINITIONS}
-)
+add_definitions (${KDE4_DEFINITIONS})
 
 include_directories (${KDE4_INCLUDES}
                      ${TELEPATHY_QT4_INCLUDE_DIR}
-                     ${TELEPATHY_LOGGER_QT4_INCLUDE_DIRS}
                      ${KTP_INCLUDE_DIR}
 )
 
@@ -72,7 +76,7 @@ set (ktp_contactlist_LIBS
     ${KDE4_KDEUI_LIBS}
     ${KDE4_KIO_LIBS}
     ${KDE4_KCMUTILS_LIBS}
-    ${TELEPATHY_LOGGER_QT4_LIBRARIES}
+    ${TELEPATHY_QT4_LIBRARIES}
     ${KDE4_KNOTIFYCONFIG_LIBS}
     )
 
@@ -84,6 +88,13 @@ set (ktp_contactlist_LIBS
 )
 endif(KPEOPLE_FOUND)
 
+if (TELEPATHY_LOGGER_QT4_FOUND)
+set(ktp_contactlist_LIBS
+    ${ktp_contactlist_LIBS}
+    ${TELEPATHY_LOGGER_QT4_LIBRARIES}
+)
+endif (TELEPATHY_LOGGER_QT4_FOUND)
+
 
 configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
 
diff --git a/contact-list-widget.cpp b/contact-list-widget.cpp
index 139190b..9928117 100644
--- a/contact-list-widget.cpp
+++ b/contact-list-widget.cpp
@@ -309,13 +309,21 @@ void ContactListWidget::addOverlayButtons()
     AudioChannelContactOverlay *audioOverlay = new AudioChannelContactOverlay(d->delegate);
     VideoChannelContactOverlay *videoOverlay = new VideoChannelContactOverlay(d->delegate);
     FileTransferContactOverlay *fileOverlay  = new FileTransferContactOverlay(d->delegate);
-    LogViewerOverlay *logViewerOverlay = new LogViewerOverlay(d->delegate);
 
     d->delegate->installOverlay(textOverlay);
     d->delegate->installOverlay(audioOverlay);
     d->delegate->installOverlay(videoOverlay);
     d->delegate->installOverlay(fileOverlay);
+
+#ifdef HAVE_TPLOGGERQT
+    LogViewerOverlay *logViewerOverlay = new LogViewerOverlay(d->delegate);
     d->delegate->installOverlay(logViewerOverlay);
+    connect(logViewerOverlay, SIGNAL(activated(Tp::AccountPtr,Tp::ContactPtr)),
+            this, SLOT(startLogViewer(Tp::AccountPtr, Tp::ContactPtr)));
+
+    connect(this, SIGNAL(enableOverlays(bool)),
+            logViewerOverlay, SLOT(setActive(bool)));
+#endif
 
     d->delegate->setViewOnAllOverlays(this);
     d->delegate->setAllOverlaysActive(true);
@@ -339,9 +347,6 @@ void ContactListWidget::addOverlayButtons()
     connect(videoOverlay, SIGNAL(activated(Tp::AccountPtr, Tp::ContactPtr)),
             this, SLOT(startVideoChannel(Tp::AccountPtr, Tp::ContactPtr)));
 
-    connect(logViewerOverlay, SIGNAL(activated(Tp::AccountPtr,Tp::ContactPtr)),
-            this, SLOT(startLogViewer(Tp::AccountPtr, Tp::ContactPtr)));
-
     connect(this, SIGNAL(enableOverlays(bool)),
             textOverlay, SLOT(setActive(bool)));
 
@@ -353,9 +358,6 @@ void ContactListWidget::addOverlayButtons()
 
     connect(this, SIGNAL(enableOverlays(bool)),
             fileOverlay, SLOT(setActive(bool)));
-
-    connect(this, SIGNAL(enableOverlays(bool)),
-            logViewerOverlay, SLOT(setActive(bool)));
 }
 
 void ContactListWidget::toggleGroups(bool show)
diff --git a/context-menu.cpp b/context-menu.cpp
index f5e34c1..f934b4a 100644
--- a/context-menu.cpp
+++ b/context-menu.cpp
@@ -40,9 +40,11 @@
 #include <TelepathyQt/Account>
 #include <TelepathyQt/PendingOperation>
 
+#ifdef HAVE_TPLOGGERQT
 #include <TelepathyLoggerQt4/Entity>
 #include <TelepathyLoggerQt4/LogManager>
 #include <TelepathyLoggerQt4/Init>
+#endif
 
 #ifdef HAVE_KPEOPLE
 #include <kpeople/personpluginmanager.h>
@@ -58,8 +60,10 @@ ContextMenu::ContextMenu(ContactListWidget *mainWidget)
 {
     m_mainWidget = mainWidget;
 
+#ifdef HAVE_TPLOGGERQT
     Tpl::init();
     m_logManager = Tpl::LogManager::instance();
+#endif
 }
 
 
@@ -71,7 +75,9 @@ ContextMenu::~ContextMenu()
 void ContextMenu::setAccountManager(const Tp::AccountManagerPtr &accountManager)
 {
     m_accountManager = accountManager;
+#ifdef HAVE_TPLOGGERQT
     m_logManager->setAccountManagerPtr(accountManager);
+#endif
 }
 
 KMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
@@ -166,11 +172,13 @@ KMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
     connect(action, SIGNAL(triggered(bool)),
             SLOT(onOpenLogViewerTriggered()));
 
+#ifdef HAVE_TPLOGGERQT
     Tpl::EntityPtr entity = Tpl::Entity::create(contact, Tpl::EntityTypeContact);
     if (m_logManager->exists(account, entity, Tpl::EventTypeMaskText)) {
         action->setEnabled(true);
     }
 #endif
+#endif
 
     menu->addSeparator();
     action = menu->addAction(KIcon("dialog-information"), i18n("Configure Notifications..."));
diff --git a/context-menu.h b/context-menu.h
index 0ef1f8b..c8618a1 100644
--- a/context-menu.h
+++ b/context-menu.h
@@ -26,7 +26,9 @@
 
 #include <TelepathyQt/Types>
 
+#ifdef HAVE_TPLOGGERQT
 #include <TelepathyLoggerQt4/LogManager>
+#endif
 
 #include "contact-list-widget.h"
 
@@ -70,7 +72,9 @@ private:
     ContactListWidget     *m_mainWidget;
     QPersistentModelIndex  m_currentIndex;
     Tp::AccountManagerPtr  m_accountManager;
+#ifdef HAVE_TPLOGGERQT
     Tpl::LogManagerPtr     m_logManager;
+#endif
 };
 
 #endif // CONTEXT_MENU_H

-- 
ktp-contact-list packaging