[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:19:33 UTC 2016


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

The following commit has been merged in the master branch:
commit d88cafb32b2e86d7609d59680cbc50c3e24568f0
Author: Aleix Pol <aleixpol at kde.org>
Date:   Mon Dec 15 19:28:59 2014 +0100

    Remove presence plasmoid as it's not integrated with the contactlist
---
 CMakeLists.txt                                    |   1 -
 presence/CMakeLists.txt                           |  22 --
 presence/Messages.sh                              |   4 -
 presence/plasma-applet-ktp-presence.desktop.cmake |  62 ----
 presence/src/presence-applet.cpp                  | 420 ----------------------
 presence/src/presence-applet.h                    | 105 ------
 6 files changed, 614 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72d18f7..b426230 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,6 +13,5 @@ include(KDECompilerSettings)
 
 add_subdirectory(chat)
 add_subdirectory(contactlist)
-# add_subdirectory(presence)
 
 plasma_install_package(person org.kde.person)
diff --git a/presence/CMakeLists.txt b/presence/CMakeLists.txt
deleted file mode 100644
index e28d899..0000000
--- a/presence/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-set(plasma_applet_ktp_presence_SRCS
-    src/presence-applet.cpp
-)
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/plasma-applet-ktp-presence.desktop.cmake
-               ${CMAKE_CURRENT_BINARY_DIR}/plasma-applet-ktp-presence.desktop
-               @ONLY)
-
-kde4_add_plugin(plasma_applet_ktp_presence ${plasma_applet_ktp_presence_SRCS})
-target_link_libraries(plasma_applet_ktp_presence
-                        ${KDE4_PLASMA_LIBS}
-                        ${KDE4_KDEUI_LIBS}
-                        ${TELEPATHY_QT4_LIBRARIES}
-                        ${KTP_LIBRARIES}
-                        ${KTP_MODELS_LIBRARIES}
-                        ${KTP_WIDGETS_LIBRARIES}
-                     )
-
-install(TARGETS plasma_applet_ktp_presence DESTINATION ${PLUGIN_INSTALL_DIR})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/plasma-applet-ktp-presence.desktop DESTINATION ${SERVICES_INSTALL_DIR})
diff --git a/presence/Messages.sh b/presence/Messages.sh
deleted file mode 100755
index 89c6013..0000000
--- a/presence/Messages.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /usr/bin/env bash
-$EXTRACTRC `find . -name "*.ui"` >> rc.cpp || exit 11
-$XGETTEXT `find . -name "*.cpp"` -o $podir/plasma_applet_org.kde.ktp-presence.pot
-rm -f rc.cpp
diff --git a/presence/plasma-applet-ktp-presence.desktop.cmake b/presence/plasma-applet-ktp-presence.desktop.cmake
deleted file mode 100644
index 2287af1..0000000
--- a/presence/plasma-applet-ktp-presence.desktop.cmake
+++ /dev/null
@@ -1,62 +0,0 @@
-[Desktop Entry]
-Name=Instant Messaging Presence
-Name[bs]=Prisutnost za instant poruke
-Name[ca]=Presència de missatgeria instantània
-Name[ca at valencia]=Presència de missatgeria instantània
-Name[cs]=Widget stavu komunikátoru
-Name[da]=Instant messaging-tilstedeværelse
-Name[de]=Instant-Messenger-Anwesenheit
-Name[el]=Παρουσία με στιγμιαίο μήνυμα
-Name[en_GB]=Instant Messaging Presence
-Name[es]=Presencia de mensajería instantánea
-Name[et]=Kiirsuhtluse olek
-Name[fi]=Pikaviestinnän läsnäolo
-Name[fr]=Présence de la messagerie instantanée
-Name[gl]=Presenza da mensaxería instantánea
-Name[hu]=Azonnali üzenetküldési állapot
-Name[ia]=Presentia de Messageria instantanee
-Name[it]=Presenza di messaggistica istantanea
-Name[kk]=Лезде хабарласу бар ма
-Name[ko]=인스턴트 메시지 상태
-Name[lt]=TP matomumas
-Name[mr]=त्वरित संदेश उपस्थिती
-Name[nb]=Tilstede for lynmeldingssystemet
-Name[nds]=Kortnarichten-Praatschap
-Name[nl]=Aanwezigheid van Instant Messaging
-Name[pa]=ਤੁਰੰਤ ਸੁਨੇਹਾ ਮੌਜੂਦਗੀ
-Name[pl]=Obecność w komunikatorze internetowym
-Name[pt]=Presença nas Mensagens Instantâneas
-Name[pt_BR]=Presença nas mensagens instantâneas
-Name[ro]=Prezență în mesageria instantanee
-Name[ru]=Диспетчер обмена сообщениями
-Name[sk]=Prítomnosť instant messagingu
-Name[sl]=Prisotnost hipnega sporočanja
-Name[sr]=Брзогласничко присуство
-Name[sr at ijekavian]=Брзогласничко присуство
-Name[sr at ijekavianlatin]=Brzoglasničko prisustvo
-Name[sr at latin]=Brzoglasničko prisustvo
-Name[sv]=Direktmeddelande finns
-Name[tr]=Anında Mesajlaşma Varlığı
-Name[uk]=Присутність у обміні повідомленнями
-Name[x-test]=xxInstant Messaging Presencexx
-Name[zh_CN]=即时通讯状态
-Name[zh_TW]=即時訊息呈現
-Type=Service
-ServiceTypes=Plasma/Applet
-Icon=user-online
-
-X-Plasma-DefaultSize=128,128
-
-X-KDE-Library=plasma_applet_ktp_presence
-X-KDE-PluginInfo-Name=org.kde.ktp-presence
-X-KDE-PluginInfo-Category=Online Services
-X-KDE-PluginInfo-Author=Francesco Nwokeka
-X-KDE-PluginInfo-Email=francesco.nwokeka at gmail.com
-X-KDE-PluginInfo-Version=@KTP_DESKTOP_APPLETS_VERSION@
-X-KDE-PluginInfo-Website=http://telepathy.freedesktop.org/
-X-KDE-PluginInfo-Depends=
-X-KDE-PluginInfo-License=LGPL
-X-KDE-PluginInfo-EnabledByDefault=true
-
-X-Plasma-NotificationArea=true
-
diff --git a/presence/src/presence-applet.cpp b/presence/src/presence-applet.cpp
deleted file mode 100644
index dcffad0..0000000
--- a/presence/src/presence-applet.cpp
+++ /dev/null
@@ -1,420 +0,0 @@
-/*
- * Copyright (C) 2011 by Francesco Nwokeka <francesco.nwokeka at gmail.com>
- * Copyright (C) 2012 by 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 St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include "presence-applet.h"
-
-#include <QDBusConnection>
-#include <QDBusConnectionInterface>
-#include <QGraphicsLinearLayout>
-
-#include <KAction>
-#include <KActionMenu>
-#include <KConfigDialog>
-#include <KConfigGroup>
-#include <KToolInvocation>
-#include <KUser>
-#include <KMessageBox>
-#include <KStandardDirs>
-
-#include <KTp/actions.h>
-#include <KTp/global-presence.h>
-#include <KTp/Models/presence-model.h>
-#include <KTp/Widgets/add-contact-dialog.h>
-#include <KTp/Widgets/join-chat-room-dialog.h>
-#include <KTp/Widgets/settings-kcm-dialog.h>
-
-#include <Plasma/ToolTipManager>
-#include <Plasma/Svg>
-
-#include <TelepathyQt/PendingOperation>
-#include <TelepathyQt/PendingContacts>
-#include <TelepathyQt/PendingReady>
-#include <TelepathyQt/PendingChannelRequest>
-#include <TelepathyQt/Account>
-
-int TelepathyPresenceApplet::s_instanceCount = 0;
-
-TelepathyPresenceApplet::TelepathyPresenceApplet(QObject *parent, const QVariantList &args)
-    : Plasma::Applet(parent, args),
-      m_globalPresence(new KTp::GlobalPresence(this)),
-      m_presences(new KTp::PresenceModel(this))
-{
-    s_instanceCount ++;
-    setupContextMenuActions();
-
-    setAspectRatioMode(Plasma::ConstrainedSquare);
-    setBackgroundHints(NoBackground);
-    resize(150, 150);
-
-    m_contactListRunning = false;
-
-    //find out if contact list is already running
-    QDBusPendingCall async = QDBusConnection::sessionBus().interface()->asyncCall(QLatin1String("NameHasOwner"),
-                                                                                  QLatin1String("org.kde.ktp-contactlist"));
-
-    QDBusPendingCallWatcher *callWatcher = new QDBusPendingCallWatcher(async, this);
-    connect(callWatcher, SIGNAL(finished(QDBusPendingCallWatcher*)),
-            this, SLOT(serviceNameFetchFinished(QDBusPendingCallWatcher*)));
-
-    m_icon = new Plasma::IconWidget(this);
-    connect(m_icon, SIGNAL(clicked()), this, SLOT(toggleContactList()));
-
-    QGraphicsLinearLayout *layout = new QGraphicsLinearLayout();
-    layout->setContentsMargins(0,0,0,0);
-    layout->setSpacing(0);
-    layout->setOrientation(Qt::Horizontal);
-    layout->addItem(m_icon);
-    layout->setAlignment(m_icon, Qt::AlignCenter);
-    setLayout(layout);
-
-    if (formFactor() == Plasma::Planar) {
-        int iconSize = IconSize(KIconLoader::Small);
-        setMinimumSize(QSize(iconSize, iconSize));
-    }
-
-    connect(m_globalPresence, SIGNAL(requestedPresenceChanged(KTp::Presence)), SLOT(onPresenceChanged(KTp::Presence)));
-    onPresenceChanged(m_globalPresence->requestedPresence());
-
-    connect(m_globalPresence, SIGNAL(connectionStatusChanged(Tp::ConnectionStatus)), SLOT(onConnectionStatusChanged(Tp::ConnectionStatus)));
-    onConnectionStatusChanged(m_globalPresence->connectionStatus());
-
-
-    setStatus(Plasma::PassiveStatus);
-
-    // register plasmoid for tooltip
-    Plasma::ToolTipManager::self()->registerWidget(this);
-}
-
-TelepathyPresenceApplet::~TelepathyPresenceApplet()
-{
-    m_contextActions.clear();
-
-    s_instanceCount--;
-    if (s_instanceCount == 0) {
-        QDBusConnection::sessionBus().unregisterService("org.kde.Telepathy.PresenceAppletActive");
-    }
-}
-
-QList<QAction*> TelepathyPresenceApplet::contextualActions()
-{
-    return m_contextActions;
-}
-
-void TelepathyPresenceApplet::init()
-{
-    QDBusConnection::sessionBus().registerService("org.kde.Telepathy.PresenceAppletActive");
-    QDBusConnection::sessionBus().registerObject("/", this, QDBusConnection::ExportAllSlots);
-
-    Tp::registerTypes();
-
-    // setup the telepathy account manager from where I'll retrieve info on accounts and contacts
-    Tp::AccountFactoryPtr  accountFactory = Tp::AccountFactory::create(QDBusConnection::sessionBus(),
-                                                                       Tp::Features() << Tp::Account::FeatureCore
-                                                                       << Tp::Account::FeatureProtocolInfo
-                                                                       << Tp::Account::FeatureProfile
-                                                                       << Tp::Account::FeatureCapabilities);
-
-    Tp::ConnectionFactoryPtr connectionFactory = Tp::ConnectionFactory::create(QDBusConnection::sessionBus(),
-                                                                               Tp::Features() << Tp::Connection::FeatureCore
-                                                                               << Tp::Connection::FeatureRoster
-                                                                               << Tp::Connection::FeatureSelfContact);
-
-    Tp::ChannelFactoryPtr channelFactory = Tp::ChannelFactory::create(QDBusConnection::sessionBus());
-
-    m_accountManager = Tp::AccountManager::create(QDBusConnection::sessionBus(),
-                                                  accountFactory,
-                                                  connectionFactory,
-                                                  channelFactory);
-
-    connect(m_accountManager.data(), SIGNAL(newAccount(Tp::AccountPtr)), SLOT(onAccountsChanged()));
-    connect(m_accountManager->becomeReady(), SIGNAL(finished(Tp::PendingOperation*)), this, SLOT(onAccountManagerReady(Tp::PendingOperation*)));
-    connect(this, SIGNAL(activate()), this, SLOT(toggleContactList()));
-
-}
-
-KIcon TelepathyPresenceApplet::getThemedIcon(const QString &iconBaseName) const
-{
-    Plasma::Svg svgIcon;
-    svgIcon.setImagePath("icons/presence-applet");
-
-    QString iconPlasmaName = iconBaseName + "-plasma";
-
-    if (svgIcon.hasElement(iconPlasmaName)) {
-        svgIcon.resize(150, 150);
-        return KIcon(svgIcon.pixmap(iconPlasmaName));
-    } else {
-        return KIcon(iconBaseName);
-    }
-}
-
-int TelepathyPresenceApplet::handleCustomPresenceChange() {
-    m_presences->loadPresences();
-    setupContextMenuActions();
-    return 0;
-}
-
-void TelepathyPresenceApplet::setupContextMenuActions()
-{
-    m_contextActions.clear();
-
-    KActionMenu *moreMenu = new KActionMenu(i18n("More"), this);
-
-    //This loops through the all presences and creates a menu, connects to slot and appends it to the context menu
-    for (int i = 0; i < m_presences->rowCount(); i++) {
-        KTp::Presence presence = m_presences->data(i).value<KTp::Presence>();
-        QString menuentry = m_presences->index(i, 0).data(Qt::DisplayRole).toString();
-        if (menuentry.size() > 60) {
-            menuentry =  menuentry.left(60).append("...");
-        }
-        KAction* action = new KAction(getThemedIcon(presence.iconName(false)), menuentry, this);
-        action->setData(QVariant::fromValue(presence));
-        connect(action, SIGNAL(triggered()), this, SLOT(onPresenceActionClicked()));
-        m_contextActions.append(action);
-    }
-
-    KAction *joinChatroomAction = new KAction(KIcon("im-irc"), i18n("Join Chat Room..."), this);
-
-    // application actions
-    KAction *showSettingsKCMAction = new KAction(KIcon("telepathy-kde"), i18n("Instant Messaging Settings..."), this);
-    KAction *showContactListAction = new KAction(KIcon("meeting-attending"), i18n("Contact List..."), this);
-    KAction *addContactAction = new KAction(KIcon("list-add-user"), i18n("Add New Contacts..."), this);
-    KAction *makeCallAction = 0;
-    if (!KStandardDirs::findExe(QLatin1String("ktp-dialout-ui")).isEmpty()) {
-        makeCallAction = new KAction(KIcon("internet-telephony"), i18n("Make a Call..."), this);
-    }
-    KAction *sendFileAction = 0;
-    if (!KStandardDirs::findExe(QLatin1String("ktp-send-file")).isEmpty()) {
-        sendFileAction = new KAction(KIcon("mail-attachment"), i18n("Send a File..."), this);
-    }
-
-    // connect actions
-    connect(showSettingsKCMAction, SIGNAL(triggered()), this, SLOT(showSettingsKCM()));
-    connect(showContactListAction, SIGNAL(triggered()), this, SLOT(toggleContactList()));
-    connect(addContactAction, SIGNAL(triggered()), this, SLOT(onAddContactRequest()));
-    connect(joinChatroomAction, SIGNAL(triggered()), this, SLOT(onJoinChatRoomRequest()));
-    if (makeCallAction) {
-        connect(makeCallAction, SIGNAL(triggered()), this, SLOT(onMakeCallRequest()));
-    }
-    if (sendFileAction) {
-        connect(sendFileAction, SIGNAL(triggered()), this, SLOT(onSendFileRequest()));
-    }
-
-    m_contextActions.append(moreMenu->addSeparator());
-    m_contextActions.append(showSettingsKCMAction);
-    m_contextActions.append(showContactListAction);
-
-    m_contextActions.append(moreMenu->addSeparator());
-    m_contextActions.append(addContactAction);
-    m_contextActions.append(joinChatroomAction);
-    if (makeCallAction) {
-        m_contextActions.append(makeCallAction);
-    }
-    if (sendFileAction) {
-        m_contextActions.append(sendFileAction);
-    }
-    m_contextActions.append(moreMenu->addSeparator());
-}
-
-void TelepathyPresenceApplet::onAccountManagerReady(Tp::PendingOperation* op)
-{
-    if (op->isError()) {
-        kDebug() << op->errorName();
-        kDebug() << op->errorMessage();
-    }
-
-    onAccountsChanged();
-
-    // set the manager to the globalpresence
-    m_globalPresence->setAccountManager(m_accountManager);
-}
-
-void TelepathyPresenceApplet::onAccountsChanged()
-{
-    //if connection to MC failed, or user has no accounts, hide presence icon.
-    if (m_accountManager->isValid() && m_accountManager->allAccounts().size() > 0) {
-        setStatus(Plasma::ActiveStatus);
-    } else {
-        setStatus(Plasma::PassiveStatus);
-    }
-}
-
-void TelepathyPresenceApplet::showSettingsKCM()
-{
-    KTp::SettingsKcmDialog *dialog = new KTp::SettingsKcmDialog();
-    dialog->addGeneralSettingsModule();
-    dialog->addNotificationsModule();
-    dialog->show();
-}
-
-void TelepathyPresenceApplet::toggleContactList()
-{
-    if (!m_contactListRunning) {
-        KToolInvocation::startServiceByDesktopName(QLatin1String("ktp-contactlist"));
-    } else {
-        //contact list is registered, call toggleWindowVisibility in contact list
-        QDBusMessage methodCall = QDBusMessage::createMethodCall(QLatin1String("org.kde.ktp-contactlist"),
-                                                                 QLatin1String("/ktp_contactlist/MainWindow"),
-                                                                 QLatin1String("org.kde.KTp.ContactList"),
-                                                                 QLatin1String("toggleWindowVisibility"));
-
-        QDBusConnection::sessionBus().asyncCall(methodCall);
-    }
-}
-
-void TelepathyPresenceApplet::onAddContactRequest()
-{
-    KTp::AddContactDialog *dialog = new KTp::AddContactDialog(m_accountManager);
-    dialog->setAttribute(Qt::WA_DeleteOnClose);
-    dialog->show();
-}
-
-void TelepathyPresenceApplet::onJoinChatRoomRequest()
-{
-    KTp::JoinChatRoomDialog *dialog = new KTp::JoinChatRoomDialog(m_accountManager);
-    connect(dialog, SIGNAL(accepted()), this, SLOT(onJoinChatRoomSelected()));
-    dialog->setAttribute(Qt::WA_DeleteOnClose);
-    dialog->show();
-}
-
-void TelepathyPresenceApplet::onJoinChatRoomSelected()
-{
-    KTp::JoinChatRoomDialog *dialog = qobject_cast<KTp::JoinChatRoomDialog*>(sender());
-    if (!dialog) {
-        return;
-    }
-
-    Tp::AccountPtr account = dialog->selectedAccount();
-    // check account validity. Should NEVER be invalid
-    if (!account.isNull()) {
-        Tp::PendingChannelRequest *channelRequest = KTp::Actions::startGroupChat(account, dialog->selectedChatRoom());
-
-        connect(channelRequest, SIGNAL(finished(Tp::PendingOperation*)), SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
-    }
-}
-
-void TelepathyPresenceApplet::onMakeCallRequest()
-{
-    KToolInvocation::kdeinitExec(QLatin1String("ktp-dialout-ui"));
-}
-
-void TelepathyPresenceApplet::onSendFileRequest()
-{
-    KToolInvocation::kdeinitExec(QLatin1String("ktp-send-file"));
-}
-
-void TelepathyPresenceApplet::onPresenceChanged(KTp::Presence presence)
-{
-    QString iconBaseName = presence.iconName(false);
-
-    Plasma::Svg svgIcon;
-    svgIcon.setImagePath("icons/presence-applet");
-    if (svgIcon.hasElement(iconBaseName+"-plasma")) {
-        svgIcon.resize(150,150);
-        KIcon icon(svgIcon.pixmap(iconBaseName+"-plasma"));
-        m_icon->setIcon(icon);
-    } else {
-        m_icon->setIcon(presence.icon());
-    }
-}
-
-void TelepathyPresenceApplet::onConnectionStatusChanged(Tp::ConnectionStatus connectionStatus)
-{
-    if (connectionStatus == Tp::ConnectionStatusConnecting) {
-        setBusy(true);
-    } else {
-        setBusy(false);
-    }
-}
-
-void TelepathyPresenceApplet::onPresenceActionClicked()
-{
-    KTp::Presence p = qobject_cast<KAction*>(sender())->data().value<KTp::Presence>();
-    p.setStatus(p.type(), p.status(), p.statusMessage());
-
-    m_globalPresence->setPresence(p);
-}
-
-void TelepathyPresenceApplet::toolTipAboutToShow()
-{
-    Plasma::ToolTipContent content;
-    KUser user;
-
-    QString presenceMsg(m_globalPresence->requestedPresence().statusMessage());
-
-    content.setImage(KIcon("telepathy-kde"));
-    content.setMainText(user.loginName());
-
-    if (m_globalPresence->connectionStatus() == Tp::ConnectionStatusConnecting) {
-        content.setSubText(i18n("Connecting..."));
-    } else if (!presenceMsg.isEmpty()) {
-        content.setSubText(presenceMsg);
-    } else {
-        content.setSubText(m_globalPresence->requestedPresence().displayString());
-    }
-
-    Plasma::ToolTipManager::self()->setContent(this, content);
-}
-
-void TelepathyPresenceApplet::toolTipHidden()
-{
-    Plasma::ToolTipManager::self()->clearContent(this);
-}
-
-void TelepathyPresenceApplet::serviceNameFetchFinished(QDBusPendingCallWatcher *callWatcher)
-{
-    QDBusPendingReply<bool> reply = *callWatcher;
-    if (reply.isError()) {
-        kWarning() << reply.error();
-        return;
-    }
-
-    m_contactListRunning = reply.value();
-
-    callWatcher->deleteLater();
-
-    //start watching for contact list appearing on the bus
-    m_contactListWatcher = new QDBusServiceWatcher(QLatin1String("org.kde.ktp-contactlist"),
-                                                   QDBusConnection::sessionBus(),
-                                                   QDBusServiceWatcher::WatchForRegistration
-                                                       | QDBusServiceWatcher::WatchForUnregistration,
-                                                   this);
-
-    connect(m_contactListWatcher, SIGNAL(serviceRegistered(QString)),
-            this, SLOT(contactListServiceRegistered()));
-
-    connect(m_contactListWatcher, SIGNAL(serviceUnregistered(QString)),
-            this, SLOT(contactListServiceUnregistered()));
-}
-
-void TelepathyPresenceApplet::contactListServiceRegistered()
-{
-    m_contactListRunning = true;
-}
-
-void TelepathyPresenceApplet::contactListServiceUnregistered()
-{
-    m_contactListRunning = false;
-}
-
-#include "presence-applet.moc"
-
-// This is the command that links your applet to the .desktop file
-K_EXPORT_PLASMA_APPLET(org.kde.ktp-presence, TelepathyPresenceApplet)
-
-
diff --git a/presence/src/presence-applet.h b/presence/src/presence-applet.h
deleted file mode 100644
index c10894c..0000000
--- a/presence/src/presence-applet.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2011 by Francesco Nwokeka <francesco.nwokeka at gmail.com>
- * Copyright (C) 2012 by 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 St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef KTP_PRESENCE_APPLET_H
-#define KTP_PRESENCE_APPLET_H
-
-#include <Plasma/Applet>
-#include <Plasma/DeclarativeWidget>
-#include <Plasma/IconWidget>
-
-#include <TelepathyQt/AccountManager>
-#include <TelepathyQt/ContactManager>
-#include <TelepathyQt/Presence>
-
-#include <KTp/presence.h>
-
-namespace KTp {
-    class GlobalPresence;
-    class PresenceModel;
-}
-
-namespace Tp {
-    class PendingOperation;
-}
-
-class GlobalPresenceWrapper;
-class KConfigDialog;
-class QAction;
-
-class TelepathyPresenceApplet: public Plasma::Applet
-{
-    Q_OBJECT
-
-public:
-    TelepathyPresenceApplet(QObject *parent, const QVariantList &args);
-    ~TelepathyPresenceApplet();
-
-    QList<QAction*> contextualActions();
-    void init();
-
-public slots:
-     Q_SCRIPTABLE int handleCustomPresenceChange();
-
-private Q_SLOTS:
-    void onAccountManagerReady(Tp::PendingOperation *op);
-    void onAccountsChanged();
-
-    void onPresenceChanged(KTp::Presence presence);
-    void onConnectionStatusChanged(Tp::ConnectionStatus connectionStatus);
-    void onPresenceActionClicked();
-    void onJoinChatRoomRequest();
-    void onJoinChatRoomSelected();
-    void toolTipAboutToShow();
-    void toolTipHidden();
-
-    void showSettingsKCM();
-    void toggleContactList();
-    void onAddContactRequest();
-    void onMakeCallRequest();
-    void onSendFileRequest();
-
-    void contactListServiceRegistered();
-    void contactListServiceUnregistered();
-    void serviceNameFetchFinished(QDBusPendingCallWatcher *callWatcher);
-
-private:
-
-    /** used to get the correct icon from either the Plasma theme or the Oxygen icon set */
-    KIcon getThemedIcon(const QString &iconBaseName) const;
-
-    /** used only upon creation to setup a list of actions for the context menu */
-    void setupContextMenuActions();
-
-    /** the number of instances which have tried to register the DBus service*/
-    static int s_instanceCount;
-
-    QList<QAction*>       m_contextActions;
-    Plasma::IconWidget   *m_icon;
-
-    Tp::AccountManagerPtr m_accountManager;
-    KTp::GlobalPresence  *m_globalPresence;
-
-    QDBusServiceWatcher  *m_contactListWatcher;
-    bool                  m_contactListRunning;
-
-    KTp::PresenceModel *m_presences;
-};
-
-#endif  // KTP_PRESENCE_APPLET_H

-- 
ktp-contact-applet packaging



More information about the pkg-kde-commits mailing list