[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:12:54 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=d173001
The following commit has been merged in the master branch:
commit d173001fef3d3770b68cd62a45e4eb7ade37c636
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Mon Oct 24 16:09:48 2011 +0100
Used global presence and error dictionary from telepathy-common repository.
---
CMakeLists.txt | 4 +-
autoaway.cpp | 3 +-
common | 2 +-
error-dictionary.cpp | 156 ------------------------------------
error-dictionary.h | 44 -----------
error-handler.cpp | 2 +-
global-presence.cpp | 166 ---------------------------------------
global-presence.h | 96 ----------------------
telepathy-kded-module-plugin.cpp | 2 +-
telepathy-module.cpp | 3 +-
telepathy-mpris.cpp | 7 +-
11 files changed, 14 insertions(+), 471 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 445cb48..eb2573c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,13 +37,13 @@ endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
set (telepathy_module_SRCS
- error-dictionary.cpp
telepathy-kded-module-plugin.cpp
- global-presence.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
diff --git a/autoaway.cpp b/autoaway.cpp
index c52798e..5448298 100644
--- a/autoaway.cpp
+++ b/autoaway.cpp
@@ -26,7 +26,8 @@
#include <KIdleTime>
#include <KConfig>
#include <KConfigGroup>
-#include "global-presence.h"
+
+#include "common/global-presence.h"
AutoAway::AutoAway(GlobalPresence* globalPresence, QObject* parent)
: TelepathyKDEDModulePlugin(globalPresence, parent),
diff --git a/common b/common
index b75768e..b9722c0 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit b75768ea2f5710e2fba241987153116dfda76dbb
+Subproject commit b9722c0fcdfa2bcf617703ac50252362f286172f
diff --git a/error-dictionary.cpp b/error-dictionary.cpp
deleted file mode 100644
index 401825a..0000000
--- a/error-dictionary.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- Telepathy error dictionary - usable strings for dbus messages
- Copyright (C) 2011 Martin Klapetek <martin.klapetek at gmail.com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-
-#include "error-dictionary.h"
-
-#include <KLocalizedString>
-
-ErrorDictionary* ErrorDictionary::m_instance = NULL;
-
-ErrorDictionary* ErrorDictionary::instance()
-{
- if (!m_instance) {
- m_instance = new ErrorDictionary(0);
- }
-
- return m_instance;
-}
-
-
-ErrorDictionary::ErrorDictionary(QObject* parent = 0)
- : QObject(parent)
-{
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.AlreadyConnected"),
- i18n("Looks like you are already connected from other location and the server does not allow multiple connections"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.AuthenticationFailed"),
- i18n("Authentication of your account failed (is your password correct?)"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Busy"),
- i18n("The channel is too busy now to process your request. Try again in a few minutes"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Cancelled"),
- i18n("The connection was canceled on your request"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Cert.Expired"),
- i18n("The SSL/TLS certificate received from server is expired"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Cert.FingerprintMismatch"),
- i18n("The SSL/TLS certificate received from server has different fingerprint than expected"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Cert.HostnameMismatch"),
- i18n("The SSL/TLS certificate received from server has different hostname than expected"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Cert.Insecure"),
- i18n("The SSL/TLS certificate received from server uses too weak encryption"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Cert.Invalid"),
- i18n("The SSL/TLS certificate received from server is invalid"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Cert.LimitExceeded"),
- i18n("The SSL/TLS certificate received from server has exceeded length limit"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Cert.NotActivated"),
- i18n("The SSL/TLS certificate received from server has not been activated yet"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Cert.NotProvided"),
- i18n("The server did not provide any SSL/TLS certificate"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Cert.Revoked"),
- i18n("The SSL/TLS certificate received from server has been revoked"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Cert.SelfSigned"),
- i18n("The SSL/TLS certificate received from server was self-signed by the server and is untrusted"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Cert.Untrusted"),
- i18n("The SSL/TLS certificate received from server was not signed by a trusted certificate authority"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Channel.Banned"),
- i18n("You have been banned from the channel"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Channel.Full"),
- i18n("The channel is full"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Channel.InviteOnly"),
- i18n("The channel is invite-only"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Channel.Kicked"),
- i18n("You have been kicked from the channel"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Confused"),
- i18n("Congratulate yourself - you just reached an impossible situation"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.ConnectionFailed"),
- i18n("Could not estabilish connection"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.ConnectionLost"),
- i18n("Connection to server was lost"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.ConnectionRefused"),
- i18n("Server refused your connection"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.ConnectionReplaced"),
- i18n("Somewhere there is another client connecting with your account and your current connection is lost"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Disconnected"),
- i18n("You have been disconnected"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.DoesNotExist"),
- i18n("You apparently do not exist "));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.EmergencyCallsNotSupported"),
- i18n("Sorry, emergency calls are not supported"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.EncryptionError"),
- i18n("An encryption error has occured"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.EncryptionNotAvailable"),
- i18n("Requested encryption is not available"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.InsufficientBalance"),
- i18n("Your call credit is too low"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.InvalidArgument"),
- i18n("An invalid argument was provided"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.InvalidHandle"),
- i18n("The specified handle is unknown on this channel"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Media.CodecsIncompatible"),
- i18n("You appear to not have any common codec with the other side"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Media.StreamingError"),
- i18n("A streaming error has occured (probably not your network related)"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Media.UnsupportedType"),
- i18n("The requested media stream type is not available"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.NetworkError"),
- i18n("There appears to be a problem with your network, check your connection"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.NoAnswer"),
- i18n("You were removed from the channel because you did not respond")); //FIXME: this sound bad
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.NotAvailable"),
- i18n("This capability is not available"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.NotCapable"),
- i18n("The contact does not have the requested capabilities"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.NotImplemented"),
- i18n("This operation is not implemented"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.NotYet"),
- i18n("This operation is not yet implemented"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.NotYours"),
- i18n("The requested channel is already being handled by some other process"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Offline"),
- i18n("This operation is unavailable as the contact is offline"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.PermissionDenied"),
- i18n("You are not permitted to perform this operation"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.PickedUpElsewhere"),
- i18n("Current call was picked up by another resource"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.RegistrationExists"),
- i18n("Account with this username already exists"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Rejected"),
- i18n("The receiver rejected your call"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.ResourceUnavailable"),
- i18n("There are insufficient resources (like free memory) to finish the operation at the moment"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.ServiceBusy"),
- i18n("Your request hit a busy resource somewhere along the way and the operation was unable to finish"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.ServiceConfused"),
- i18n("An internal error has occured (known as the 'Confused service error')"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.SoftwareUpgradeRequired"),
- i18n("You are using too old software. Please try updating all Telepathy packages to a newer version"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.Terminated"),
- i18n("The channel was terminated for no apparent reason"));
- m_dict.insert(QLatin1String("org.freedesktop.Telepathy.Error.WouldBreakAnonymity"),
- i18n("This operation can not be finished as it would break your anonymity request"));
-}
-
-ErrorDictionary::~ErrorDictionary()
-{
-
-}
-
-QString ErrorDictionary::displayErrorMessage(const QString& dbusErrorName) const
-{
- return m_dict.value(dbusErrorName);
-}
diff --git a/error-dictionary.h b/error-dictionary.h
deleted file mode 100644
index 4a47536..0000000
--- a/error-dictionary.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- Telepathy error dictionary - usable strings for dbus messages
- Copyright (C) 2011 Martin Klapetek <martin.klapetek at gmail.com>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-
-#ifndef ERROR_DICTIONARY_H
-#define ERROR_DICTIONARY_H
-
-#include <QObject>
-#include <QHash>
-
-class ErrorDictionary : public QObject
-{
-
-public:
- static ErrorDictionary *instance();
- virtual ~ErrorDictionary();
-
- ///Returns an error message usable for displaying to the user
- QString displayErrorMessage(const QString& dbusErrorName) const;
-
-private:
- ErrorDictionary(QObject *parent);
- QHash<QString, QString> m_dict;
-
- static ErrorDictionary *m_instance;
-};
-
-#endif // ERROR_DICTIONARY_H
diff --git a/error-handler.cpp b/error-handler.cpp
index 1f4f8ea..3c90a16 100644
--- a/error-handler.cpp
+++ b/error-handler.cpp
@@ -23,7 +23,7 @@
#include <KNotification>
#include <KAboutData>
-#include "error-dictionary.h"
+#include "common/error-dictionary.h"
ErrorHandler::ErrorHandler(const Tp::AccountManagerPtr& am, QObject* parent)
: QObject(parent)
diff --git a/global-presence.cpp b/global-presence.cpp
deleted file mode 100644
index b7ee786..0000000
--- a/global-presence.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Class handling global presence
- * Copyright (C) 2011 David Edmundson <kde at davidedmundson.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "global-presence.h"
-
-#include <TelepathyQt4/AccountSet>
-#include <TelepathyQt4/Account>
-
-#include <KDebug>
-
-GlobalPresence::GlobalPresence(QObject *parent)
- : QObject(parent),
- m_requestedPresence(Tp::Presence::offline()),
- m_currentPresence(Tp::Presence::offline()),
- m_changingPresence(false)
-{
- m_presenceSorting[Tp::ConnectionPresenceTypeAvailable] = 0;
- m_presenceSorting[Tp::ConnectionPresenceTypeBusy] = 1;
- m_presenceSorting[Tp::ConnectionPresenceTypeHidden] = 2;
- m_presenceSorting[Tp::ConnectionPresenceTypeAway] = 3;
- m_presenceSorting[Tp::ConnectionPresenceTypeExtendedAway] = 4;
- //don't distinguish between the following three presences
- m_presenceSorting[Tp::ConnectionPresenceTypeError] = 5;
- m_presenceSorting[Tp::ConnectionPresenceTypeUnknown] = 5;
- m_presenceSorting[Tp::ConnectionPresenceTypeUnset] = 5;
- m_presenceSorting[Tp::ConnectionPresenceTypeOffline] = 6;
-}
-
-void GlobalPresence::setAccountManager(const Tp::AccountManagerPtr &accountManager)
-{
- if (! accountManager->isReady()) {
- kFatal("GlobalPresence used with unready account manager");
- }
-
- m_enabledAccounts = accountManager->enabledAccounts();
- m_onlineAccounts = accountManager->onlineAccounts();
-
- Q_FOREACH(const Tp::AccountPtr &account, m_enabledAccounts->accounts()) {
- onAccountAdded(account);
- }
-
- onCurrentPresenceChanged();
- onRequestedPresenceChanged();
- onChangingPresence();
-
- connect(m_enabledAccounts.data(), SIGNAL(accountAdded(Tp::AccountPtr)), SLOT(onAccountAdded(Tp::AccountPtr)));
-}
-
-
-Tp::Presence GlobalPresence::currentPresence() const
-{
- return m_currentPresence;
-}
-
-Tp::Presence GlobalPresence::requestedPresence() const
-{
- return m_requestedPresence;
-}
-
-bool GlobalPresence::isChangingPresence() const
-{
- return m_changingPresence;
-}
-
-
-void GlobalPresence::setPresence(const Tp::Presence &presence)
-{
- Q_FOREACH(const Tp::AccountPtr &account, m_enabledAccounts->accounts()) {
- account->setRequestedPresence(presence);
- }
-}
-
-
-void GlobalPresence::onAccountAdded(const Tp::AccountPtr &account)
-{
- connect(account.data(), SIGNAL(changingPresence(bool)), SLOT(onChangingPresence()));
- connect(account.data(), SIGNAL(requestedPresenceChanged(Tp::Presence)), SLOT(onRequestedPresenceChanged()));
- connect(account.data(), SIGNAL(currentPresenceChanged(Tp::Presence)), SLOT(onCurrentPresenceChanged()));
-}
-
-void GlobalPresence::onCurrentPresenceChanged()
-{
- Tp::Presence highestCurrentPresence = Tp::Presence::offline();
- Q_FOREACH(const Tp::AccountPtr &account, m_enabledAccounts->accounts()) {
- if (m_presenceSorting[account->currentPresence().type()] < m_presenceSorting[highestCurrentPresence.type()]) {
- highestCurrentPresence = account->currentPresence();
- }
- }
-
- if (highestCurrentPresence.type() != m_currentPresence.type() ||
- highestCurrentPresence.status() != m_requestedPresence.status()) {
- m_currentPresence = highestCurrentPresence;
- Q_EMIT currentPresenceChanged(m_currentPresence);
- }
-}
-
-void GlobalPresence::onRequestedPresenceChanged()
-{
- Tp::Presence highestRequestedPresence = Tp::Presence::offline();
- Q_FOREACH(const Tp::AccountPtr &account, m_enabledAccounts->accounts()) {
- if (m_presenceSorting[account->requestedPresence().type()] < m_presenceSorting[highestRequestedPresence.type()]) {
- highestRequestedPresence = account->currentPresence();
- }
- }
-
- if (highestRequestedPresence.type() != m_requestedPresence.type() &&
- highestRequestedPresence.status() != m_requestedPresence.status()) {
- m_requestedPresence = highestRequestedPresence;
- Q_EMIT requestedPresenceChanged(m_requestedPresence);
- }
-}
-
-void GlobalPresence::onChangingPresence()
-{
- bool changingPresence = false;
- Q_FOREACH(const Tp::AccountPtr &account, m_enabledAccounts->accounts()) {
- if (account->isChangingPresence()) {
- changingPresence = true;
- }
- }
-
- if (changingPresence != m_changingPresence) {
- m_changingPresence = changingPresence;
- Q_EMIT (m_changingPresence);
- }
-}
-
-bool GlobalPresence::hasEnabledAccounts() const
-{
- if (m_enabledAccounts->accounts().isEmpty()) {
- return false;
- }
-
- return true;
-}
-
-void GlobalPresence::saveCurrentPresence()
-{
- m_savedPresence = m_currentPresence;
-}
-
-void GlobalPresence::restoreSavedPresence()
-{
- setPresence(m_savedPresence);
-}
-
-Tp::AccountSetPtr GlobalPresence::onlineAccounts() const
-{
- return m_onlineAccounts;
-}
diff --git a/global-presence.h b/global-presence.h
deleted file mode 100644
index 420f0e2..0000000
--- a/global-presence.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Class handling global presence
- * Copyright (C) 2011 David Edmundson <kde at davidedmundson.co.uk>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef GLOBALPRESENCE_H
-#define GLOBALPRESENCE_H
-
-#include <QObject>
-#include <TelepathyQt4/AccountManager>
-#include <TelepathyQt4/AccountSet>
-
-
-/** This class handles the presence between all enabled accounts
- * It shows the highest current available presence, indicates if any accounts are changing, and what they are changing to.
-*/
-
-class GlobalPresence : public QObject
-{
- Q_OBJECT
-public:
- GlobalPresence(QObject *parent = 0);
-
- /** Set the account manager to use
- * @param accountManager should be ready.
- */
- void setAccountManager(const Tp::AccountManagerPtr &accountManager);
-
-
- /** The most online presence of any account*/
- Tp::Presence currentPresence() const;
-
- /** The most online presence requested for any account if any of the accounts are changing state.
- otherwise returns current presence*/
- Tp::Presence requestedPresence() const;
-
- /** Returns true if any account is changing state (i.e connecting*/
- bool isChangingPresence() const;
-
- /** Returns true if there is any enabled account */
- bool hasEnabledAccounts() const;
-
- Tp::AccountSetPtr onlineAccounts() const;
-
-Q_SIGNALS:
- void requestedPresenceChanged(const Tp::Presence &customPresence);
- void currentPresenceChanged(const Tp::Presence &presence);
- void changingPresence(bool isChanging);
-
-public Q_SLOTS:
- /** Set all enabled accounts to the specified presence*/
- void setPresence(const Tp::Presence &presence);
-
- /**Saves the current presence to memory*/
- void saveCurrentPresence();
- /**Restores the saved presence from memory */
- void restoreSavedPresence();
-
-private Q_SLOTS:
- void onCurrentPresenceChanged();
- void onRequestedPresenceChanged();
- void onChangingPresence();
-
- void onAccountAdded(const Tp::AccountPtr &account);
-
-private:
- Tp::AccountSetPtr m_enabledAccounts;
- Tp::AccountSetPtr m_onlineAccounts;
-
- /**Saved presence for later restoration (for example after returning from auto-away) */
- Tp::Presence m_savedPresence;
- /** A cache of the last sent requested presence, to avoid resignalling*/
- Tp::Presence m_requestedPresence;
- /** A cache of the last sent presence*/
- Tp::Presence m_currentPresence;
- bool m_changingPresence;
-
- /// Sets the sorting order of presences
- QHash<uint, int> m_presenceSorting;
-};
-
-#endif // GLOBALPRESENCE_H
diff --git a/telepathy-kded-module-plugin.cpp b/telepathy-kded-module-plugin.cpp
index 2370a2c..f77ae2a 100644
--- a/telepathy-kded-module-plugin.cpp
+++ b/telepathy-kded-module-plugin.cpp
@@ -20,7 +20,7 @@
#include "telepathy-kded-module-plugin.h"
-#include "global-presence.h"
+#include "common/global-presence.h"
TelepathyKDEDModulePlugin::TelepathyKDEDModulePlugin(GlobalPresence* globalPresence, QObject* parent)
: QObject(parent),
diff --git a/telepathy-module.cpp b/telepathy-module.cpp
index a8525e1..c1ae5e9 100644
--- a/telepathy-module.cpp
+++ b/telepathy-module.cpp
@@ -27,10 +27,11 @@
#include <TelepathyQt4/PendingReady>
#include <TelepathyQt4/Debug>
+#include "common/global-presence.h"
+
#include "telepathy-mpris.h"
#include "autoaway.h"
#include "error-handler.h"
-#include "global-presence.h"
#include "telepathy-kded-module-plugin.h"
#include <KConfigGroup>
diff --git a/telepathy-mpris.cpp b/telepathy-mpris.cpp
index b6c530b..dfee15e 100644
--- a/telepathy-mpris.cpp
+++ b/telepathy-mpris.cpp
@@ -23,11 +23,14 @@
#include <QDBusInterface>
#include <QDBusReply>
#include <QVariant>
+
#include <KDebug>
-#include <TelepathyQt4/AccountSet>
#include <KSharedConfig>
#include <KConfigGroup>
-#include "global-presence.h"
+
+#include <TelepathyQt4/AccountSet>
+
+#include "common/global-presence.h"
TelepathyMPRIS::TelepathyMPRIS(GlobalPresence* globalPresence, QObject* parent)
: TelepathyKDEDModulePlugin(globalPresence, parent),
--
ktp-kded-integration-module packaging
More information about the pkg-kde-commits
mailing list