[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:13:34 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=d0cd605
The following commit has been merged in the master branch:
commit d0cd60545eae482c7dcbde5c8e120b1625778fc8
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date: Wed Mar 14 19:35:41 2012 +0100
Compile
---
CMakeLists.txt | 12 +++++-----
cmake/modules/FindTelepathyQt4.cmake | 43 ------------------------------------
src/telepathyContactList.cpp | 28 +++++++++++------------
src/telepathyContactList.h | 2 +-
4 files changed, 21 insertions(+), 64 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0d151c..d05fb73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,13 +6,14 @@ set(CMAKE_MODULE_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
${CMAKE_MODULE_PATH}
)
-set(IS_TELEPATHY_KDE_INTERNAL_MODULE TRUE)
+set(IS_KTP_INTERNAL_MODULE TRUE)
set(KDE_MIN_VERSION "4.7.0")
find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
find_package(KDE4Workspace REQUIRED)
-find_package(TelepathyQt4 0.7.3 REQUIRED)
-find_package (KTelepathy REQUIRED)
+find_package(TelepathyQt4 0.8.90 REQUIRED)
+find_package(KTp REQUIRED)
+#find_package (KTelepathy REQUIRED)
include(KDE4Defaults)
@@ -25,7 +26,7 @@ include_directories(${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
${KDE4_INCLUDES}
${TELEPATHY_QT4_INCLUDE_DIR}
- ${KTELEPATHY_INCLUDE_DIR}
+ ${KTP_INCLUDE_DIR}
)
set(telepathy_contact_list_applet_SRCS
@@ -40,7 +41,8 @@ target_link_libraries(plasma_applet_telepathy_contact_list
${KDE4_KDEUI_LIBS}
${TELEPATHY_QT4_LIBRARIES}
${QT_QTDECLARATIVE_LIBRARY}
- ${KTELEPATHY_MODELS_LIBRARIES})
+ ${KTP_MODELS_LIBRARIES})
+# ${KTELEPATHY_MODELS_LIBRARIES})
install(DIRECTORY src/declarative/ DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/org.kde.telepathy-contact-list)
install(TARGETS plasma_applet_telepathy_contact_list DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/cmake/modules/FindTelepathyQt4.cmake b/cmake/modules/FindTelepathyQt4.cmake
deleted file mode 100644
index c7f8f91..0000000
--- a/cmake/modules/FindTelepathyQt4.cmake
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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/telepathyContactList.cpp b/src/telepathyContactList.cpp
index c5c7e29..b07cfa3 100644
--- a/src/telepathyContactList.cpp
+++ b/src/telepathyContactList.cpp
@@ -24,15 +24,15 @@
#include <QtDeclarative/QDeclarativeEngine>
#include <QtDeclarative/QDeclarativeContext>
-#include <TelepathyQt4/AccountFactory>
-#include <TelepathyQt4/ContactFactory>
-#include <TelepathyQt4/ConnectionFactory>
-#include <TelepathyQt4/AccountManager>
-#include <TelepathyQt4/PendingReady>
+#include <TelepathyQt/AccountFactory>
+#include <TelepathyQt/ContactFactory>
+#include <TelepathyQt/ConnectionFactory>
+#include <TelepathyQt/AccountManager>
+#include <TelepathyQt/PendingReady>
#include "flat-model-proxy.h"
-#include <KTelepathy/Models/accounts-model.h>
+#include <KTp/Models/accounts-model.h>
@@ -44,7 +44,7 @@ TelepathyContactList::TelepathyContactList(QObject* parent, const QVariantList&
// set plasmoid size
setMinimumSize(250, 400);
setAspectRatioMode(Plasma::IgnoreAspectRatio);
-
+
Tp::registerTypes();
// Start setting up the Telepathy AccountManager.
@@ -65,9 +65,9 @@ TelepathyContactList::TelepathyContactList(QObject* parent, const QVariantList&
<< Tp::Contact::FeatureAvatarData
<< Tp::Contact::FeatureSimplePresence
<< Tp::Contact::FeatureCapabilities);
-
-
-
+
+
+
Tp::ChannelFactoryPtr channelFactory = Tp::ChannelFactory::create(QDBusConnection::sessionBus());
m_accountManager = Tp::AccountManager::create(QDBusConnection::sessionBus(),
@@ -79,10 +79,6 @@ TelepathyContactList::TelepathyContactList(QObject* parent, const QVariantList&
connect(m_accountManager->becomeReady(),
SIGNAL(finished(Tp::PendingOperation*)),
SLOT(onAccountManagerReady(Tp::PendingOperation*)));
-
- m_model = new AccountsModel(m_accountManager, this);
-
-
}
TelepathyContactList::~TelepathyContactList()
@@ -133,5 +129,7 @@ K_EXPORT_PLASMA_APPLET(telepathy-contact-list, TelepathyContactList)
void TelepathyContactList::onAccountManagerReady(Tp::PendingOperation *op)
{
- m_model->init();
+ m_model = new AccountsModel(this);
+ m_model->setAccountManager(m_accountManager);
+ init();
}
diff --git a/src/telepathyContactList.h b/src/telepathyContactList.h
index ae095a1..6054801 100644
--- a/src/telepathyContactList.h
+++ b/src/telepathyContactList.h
@@ -23,7 +23,7 @@
#include <Plasma/Applet>
#include <Plasma/DeclarativeWidget>
-#include <TelepathyQt4/Types>
+#include <TelepathyQt/Types>
class AccountsModel;
--
ktp-contact-applet packaging
More information about the pkg-kde-commits
mailing list