[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/15.12.1-2-382-gbd961c2
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:13:06 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=8d2e9d5
The following commit has been merged in the master branch:
commit 8d2e9d55d04ac6b5823f79329c8dcab554866abf
Author: Dario Freddi <dario.freddi at collabora.com>
Date: Wed Nov 23 23:13:04 2011 +0100
Port to new KTelepathy internal library
---
CMakeLists.txt | 17 ++++-------------
autoaway.cpp | 4 ++--
autoaway.h | 4 +++-
error-handler.cpp | 4 ++--
telepathy-kded-module-plugin.cpp | 4 ++--
telepathy-kded-module-plugin.h | 7 +++++--
telepathy-module.cpp | 4 ++--
telepathy-module.h | 7 +++++--
telepathy-mpris.cpp | 4 ++--
telepathy-mpris.h | 2 +-
10 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb2573c..335d7f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,8 +5,10 @@ set (CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH}
)
+set(IS_TELEPATHY_KDE_INTERNAL_MODULE TRUE)
find_package (KDE4 REQUIRED)
find_package (TelepathyQt4 0.7.1 REQUIRED)
+find_package (KTelepathy REQUIRED)
# set some default settings
include (KDE4Defaults)
@@ -23,27 +25,15 @@ include_directories (${KDE4_INCLUDES}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${TELEPATHY_QT4_INCLUDE_DIR}
+ ${KTELEPATHY_INCLUDE_DIR}
)
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
-execute_process(COMMAND git submodule init
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-execute_process(COMMAND git submodule update
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-)
-endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
-
-
set (telepathy_module_SRCS
telepathy-kded-module-plugin.cpp
telepathy-module.cpp
autoaway.cpp
telepathy-mpris.cpp
error-handler.cpp
- common/global-presence.cpp
- common/error-dictionary.cpp
)
kde4_add_plugin (kded_telepathy_module
@@ -53,6 +43,7 @@ kde4_add_plugin (kded_telepathy_module
target_link_libraries (kded_telepathy_module
${KDE4_KDECORE_LIBS}
${TELEPATHY_QT4_LIBRARIES}
+ ${KTELEPATHY_LIBRARIES}
${KDE4_KDEUI_LIBS}
kidletime
diff --git a/autoaway.cpp b/autoaway.cpp
index 7c72024..49a79b1 100644
--- a/autoaway.cpp
+++ b/autoaway.cpp
@@ -27,9 +27,9 @@
#include <KConfig>
#include <KConfigGroup>
-#include "common/global-presence.h"
+#include <KTelepathy/global-presence.h>
-AutoAway::AutoAway(GlobalPresence* globalPresence, QObject* parent)
+AutoAway::AutoAway(KTp::GlobalPresence* globalPresence, QObject* parent)
: TelepathyKDEDModulePlugin(globalPresence, parent),
m_awayTimeoutId(-1),
m_extAwayTimeoutId(-1)
diff --git a/autoaway.h b/autoaway.h
index e9eb1ae..519df42 100644
--- a/autoaway.h
+++ b/autoaway.h
@@ -26,14 +26,16 @@
#include <TelepathyQt4/Presence>
#include <TelepathyQt4/AccountManager>
+namespace KTp {
class GlobalPresence;
+}
class AutoAway : public TelepathyKDEDModulePlugin
{
Q_OBJECT
public:
- AutoAway(GlobalPresence *globalPresence, QObject* parent = 0);
+ AutoAway(KTp::GlobalPresence *globalPresence, QObject* parent = 0);
~AutoAway();
void readConfig();
diff --git a/error-handler.cpp b/error-handler.cpp
index 476965a..fbecd19 100644
--- a/error-handler.cpp
+++ b/error-handler.cpp
@@ -23,7 +23,7 @@
#include <KNotification>
#include <KAboutData>
-#include "common/error-dictionary.h"
+#include <KTelepathy/error-dictionary.h>
ErrorHandler::ErrorHandler(const Tp::AccountManagerPtr& am, QObject* parent)
: QObject(parent)
@@ -65,7 +65,7 @@ void ErrorHandler::handleErrors(const Tp::ConnectionStatus status)
showMessageToUser(i18n("Could not connect %1. There was a network error, check your connection", account->displayName()), ErrorHandler::SystemMessageError);
break;
default:
- showMessageToUser(i18n("There was a problem while trying to connect %1 - %2", account->displayName(), ErrorDictionary::instance()->displayVerboseErrorMessage(connectionError)), ErrorHandler::SystemMessageError);
+ showMessageToUser(i18n("There was a problem while trying to connect %1 - %2", account->displayName(), KTp::ErrorDictionary::displayVerboseErrorMessage(connectionError)), ErrorHandler::SystemMessageError);
break;
}
}
diff --git a/telepathy-kded-module-plugin.cpp b/telepathy-kded-module-plugin.cpp
index f77ae2a..4f2f99c 100644
--- a/telepathy-kded-module-plugin.cpp
+++ b/telepathy-kded-module-plugin.cpp
@@ -20,9 +20,9 @@
#include "telepathy-kded-module-plugin.h"
-#include "common/global-presence.h"
+#include <KTelepathy/global-presence.h>
-TelepathyKDEDModulePlugin::TelepathyKDEDModulePlugin(GlobalPresence* globalPresence, QObject* parent)
+TelepathyKDEDModulePlugin::TelepathyKDEDModulePlugin(KTp::GlobalPresence* globalPresence, QObject* parent)
: QObject(parent),
m_enabled(false),
m_pluginPriority(50)
diff --git a/telepathy-kded-module-plugin.h b/telepathy-kded-module-plugin.h
index 4f1aa78..ef3a56c 100644
--- a/telepathy-kded-module-plugin.h
+++ b/telepathy-kded-module-plugin.h
@@ -25,13 +25,16 @@
#include <TelepathyQt4/Presence>
#include <TelepathyQt4/AccountManager>
+namespace KTp {
class GlobalPresence;
+}
+
class TelepathyKDEDModulePlugin : public QObject
{
Q_OBJECT
public:
- TelepathyKDEDModulePlugin(GlobalPresence *globalPresence, QObject *parent = 0);
+ TelepathyKDEDModulePlugin(KTp::GlobalPresence *globalPresence, QObject *parent = 0);
virtual ~TelepathyKDEDModulePlugin();
bool isActive() const { return m_active; };
@@ -52,7 +55,7 @@ protected:
void setPluginPriority(int priority) { m_pluginPriority = priority; };
void setRequestedPresence(const Tp::Presence &presence) { m_requestedPresence = presence; };
- GlobalPresence *m_globalPresence;
+ KTp::GlobalPresence *m_globalPresence;
private:
Tp::Presence m_requestedPresence;
diff --git a/telepathy-module.cpp b/telepathy-module.cpp
index 4ffbd3e..0c3ea5f 100644
--- a/telepathy-module.cpp
+++ b/telepathy-module.cpp
@@ -27,7 +27,7 @@
#include <TelepathyQt4/PendingReady>
#include <TelepathyQt4/Debug>
-#include "common/global-presence.h"
+#include <KTelepathy/global-presence.h>
#include "telepathy-mpris.h"
#include "autoaway.h"
@@ -82,7 +82,7 @@ void TelepathyModule::onAccountManagerReady(Tp::PendingOperation* op)
return;
}
- m_globalPresence = new GlobalPresence(this);
+ m_globalPresence = new KTp::GlobalPresence(this);
m_globalPresence->setAccountManager(m_accountManager);
m_autoAway = new AutoAway(m_globalPresence, this);
diff --git a/telepathy-module.h b/telepathy-module.h
index 3ab89bc..7215c0b 100644
--- a/telepathy-module.h
+++ b/telepathy-module.h
@@ -29,8 +29,11 @@ namespace Tp {
class PendingOperation;
}
+namespace KTp {
+ class GlobalPresence;
+}
+
class TelepathyKDEDModulePlugin;
-class GlobalPresence;
class ErrorHandler;
class TelepathyMPRIS;
class AutoAway;
@@ -56,7 +59,7 @@ private:
AutoAway *m_autoAway;
TelepathyMPRIS *m_mpris;
ErrorHandler *m_errorHandler;
- GlobalPresence *m_globalPresence;
+ KTp::GlobalPresence *m_globalPresence;
QList<TelepathyKDEDModulePlugin*> m_pluginStack;
};
diff --git a/telepathy-mpris.cpp b/telepathy-mpris.cpp
index 32fd5f2..a7a1a75 100644
--- a/telepathy-mpris.cpp
+++ b/telepathy-mpris.cpp
@@ -30,9 +30,9 @@
#include <TelepathyQt4/AccountSet>
-#include "common/global-presence.h"
+#include <KTelepathy/global-presence.h>
-TelepathyMPRIS::TelepathyMPRIS(GlobalPresence* globalPresence, QObject* parent)
+TelepathyMPRIS::TelepathyMPRIS(KTp::GlobalPresence* globalPresence, QObject* parent)
: TelepathyKDEDModulePlugin(globalPresence, parent),
m_presenceActivated(false)
{
diff --git a/telepathy-mpris.h b/telepathy-mpris.h
index d5f1b31..10bec22 100644
--- a/telepathy-mpris.h
+++ b/telepathy-mpris.h
@@ -30,7 +30,7 @@ class TelepathyMPRIS : public TelepathyKDEDModulePlugin
Q_OBJECT
public:
- TelepathyMPRIS(GlobalPresence *globalPresence, QObject *parent = 0);
+ TelepathyMPRIS(KTp::GlobalPresence *globalPresence, QObject *parent = 0);
virtual ~TelepathyMPRIS();
QString pluginName() const;
--
ktp-kded-integration-module packaging
More information about the pkg-kde-commits
mailing list