[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=c7544d7

The following commit has been merged in the master branch:
commit c7544d7bd75d8051396fbb10322a3133fbb7b5f6
Author: Francesco Nwokeka <francesco.nwokeka at gmail.com>
Date:   Wed Aug 17 14:06:03 2011 +0200

    App now links against ktelepathy lib
---
 CMakeLists.txt                       | 23 +++++++++++++++----
 cmake/modules/FindTelepathyQt4.cmake | 43 ++++++++++++++++++++++++++++++++++++
 src/config.cpp                       |  7 ++++++
 src/telepathyContact.cpp             |  3 ++-
 4 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae70b3c..d6d90c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,13 +2,28 @@ project(plasma_applet_telepathy_contact)
 
 cmake_minimum_required(VERSION 2.8)
 
-find_package(KDE4 REQUIRED)
+set(CMAKE_MODULE_PATH
+    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
+    ${CMAKE_MODULE_PATH}
+)
+
+set(KDE_MIN_VERSION "4.7.0")
+
+find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
 find_package(KDE4Workspace REQUIRED)
+find_package(TelepathyQt4 0.7.1 REQUIRED)
 
 include(KDE4Defaults)
 
-add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
+add_definitions(${QT_DEFINITIONS}
+                ${KDE4_DEFINITIONS}
+)
+
+include_directories(${CMAKE_SOURCE_DIR}
+                    ${CMAKE_BINARY_DIR}
+                    ${KDE4_INCLUDES}
+                    ${TELEPATHY_QT4_INCLUDE_DIR}
+)
 
 set(telepathy_contact_applet_SRCS
     src/telepathyContact.cpp
@@ -20,7 +35,7 @@ kde4_add_ui_files(telepathy_contact_applet_SRCS
 )
 
 kde4_add_plugin(plasma_applet_telepathy_contact ${telepathy_contact_applet_SRCS})
-target_link_libraries(plasma_applet_telepathy_contact ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS})
+target_link_libraries(plasma_applet_telepathy_contact ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS} ktelepathy)
 
 install(TARGETS plasma_applet_telepathy_contact DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES telepathy-contact-applet.desktop DESTINATION ${SERVICES_INSTALL_DIR})
\ No newline at end of file
diff --git a/cmake/modules/FindTelepathyQt4.cmake b/cmake/modules/FindTelepathyQt4.cmake
new file mode 100644
index 0000000..c7f8f91
--- /dev/null
+++ b/cmake/modules/FindTelepathyQt4.cmake
@@ -0,0 +1,43 @@
+# Try to find the Qt4 binding of the Telepathy library
+# TELEPATHY_QT4_FOUND - system has TelepathyQt4
+# TELEPATHY_QT4_INCLUDE_DIR - the TelepathyQt4 include directory
+# TELEPATHY_QT4_LIBRARIES - Link these to use TelepathyQt4
+
+# Copyright (c) 2008, Allen Winter <winter at kde.org>
+# Copyright (c) 2009, Andre Moreira Magalhaes <andrunko at gmail.com>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+set(TELEPATHY_QT4_FIND_REQUIRED ${TelepathyQt4_FIND_REQUIRED})
+if(TELEPATHY_QT4_INCLUDE_DIR AND TELEPATHY_QT4_LIBRARIES)
+  # Already in cache, be silent
+  set(TELEPATHY_QT4_FIND_QUIETLY TRUE)
+endif(TELEPATHY_QT4_INCLUDE_DIR AND TELEPATHY_QT4_LIBRARIES)
+
+find_package(PkgConfig)
+if(PKG_CONFIG_FOUND)
+    if (TelepathyQt4_FIND_VERSION_EXACT)
+        pkg_check_modules(PC_TELEPATHY_QT4 QUIET TelepathyQt4=${TelepathyQt4_FIND_VERSION})
+    else (TelepathyQt4_FIND_VERSION_EXACT)
+        pkg_check_modules(PC_TELEPATHY_QT4 QUIET TelepathyQt4>=${TelepathyQt4_FIND_VERSION})
+    endif (TelepathyQt4_FIND_VERSION_EXACT)
+endif(PKG_CONFIG_FOUND)
+
+find_path(TELEPATHY_QT4_INCLUDE_DIR
+          NAMES TelepathyQt4/Types
+          HINTS
+          ${PC_TELEPATHY_QT4_INCLUDEDIR}
+          ${PC_TELEPATHY_QT4_INCLUDE_DIRS}
+)
+
+find_library(TELEPATHY_QT4_LIBRARIES
+             NAMES telepathy-qt4
+             HINTS
+             ${PC_TELEPATHY_QT4_LIBDIR}
+             ${PC_TELEPATHY_QT4_LIBRARY_DIRS}
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(TELEPATHY_QT4 DEFAULT_MSG
+                                  TELEPATHY_QT4_LIBRARIES TELEPATHY_QT4_INCLUDE_DIR)
diff --git a/src/config.cpp b/src/config.cpp
index dbbbcb4..7a57619 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -19,12 +19,19 @@
 
 #include "config.h"
 
+#include <KTelepathy/PeopleManager>
+#include <KTelepathy/PersonSetModel>
+#include <KTelepathy/PersonSet>
+
 Config::Config(QWidget* parent)
     : KDialog(parent)
 {
     QWidget *widget = new QWidget(this);
     ui.setupUi(widget);
     setMainWidget(widget);
+
+    // populate telepathy contact list
+//     ui.contactListView->setModel(new KTelepathy::PersonSetModel(KTelepathy::PeopleManager::instance()->everyone()));
 }
 
 Config::~Config()
diff --git a/src/telepathyContact.cpp b/src/telepathyContact.cpp
index 567fad2..84e6c9f 100644
--- a/src/telepathyContact.cpp
+++ b/src/telepathyContact.cpp
@@ -36,7 +36,8 @@ TelepathyContact::TelepathyContact(QObject* parent, const QVariantList& args)
 
 TelepathyContact::~TelepathyContact()
 {
-
+    delete m_config;
+    delete m_declarative;
 }
 
 void TelepathyContact::init()

-- 
ktp-contact-applet packaging