[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdenetwork
From: Florian Reinhard <florian.reinhard () googlemail ! com>
Date: 2011-02-19 10:43:43
Message-ID: 20110219104343.C3C83AC8BF () svn ! kde ! org
[Download RAW message or body]
SVN commit 1221586 by reinhard:
Port krdc,krfb to telepathy-qt4-0.5.x
Reviewed-by: George Kiagiadakis <kiagiadakis.george@gmail.com>Reviewed-by:
M +1 -1 krdc/krdc_approver/approver.cpp
M +16 -14 krdc/krdc_approver/approvermanager.cpp
M +0 -1 krdc/krdc_approver/approvermanager.h
M +2 -2 krdc/tube.cpp
M +11 -10 krdc/tubesmanager.cpp
M +1 -1 krdc/tubesmanager.h
M +10 -10 krfb/krfb/tubesclienthandler.cpp
M +1 -1 krfb/krfb/tubesclienthandler.h
M +4 -4 krfb/krfb/tubesrfbserver.cpp
--- trunk/KDE/kdenetwork/krdc/krdc_approver/approver.cpp #1221585:1221586
@@ -88,7 +88,7 @@
notification->setActions(QStringList() << i18n("Accept") << i18n("Reject"));
Tp::Client::ConnectionInterfaceAvatarsInterface *avatarIface =
- m_dispatchOp->channels()[0]->connection()->avatarsInterface();
+ m_dispatchOp->channels()[0]->connection()->optionalInterface<Tp::Client::ConnectionInterfaceAvatarsInterface>();
if (avatarIface) {
QDBusPendingReply<QByteArray, QString> reply = avatarIface->RequestAvatar(
--- trunk/KDE/kdenetwork/krdc/krdc_approver/approvermanager.cpp #1221585:1221586
@@ -28,28 +28,31 @@
#include <QDBusObjectPath>
#include <QDBusConnection>
+#include <KApplication>
+#include <KDebug>
+
+#include <TelepathyQt4/Account>
+#include <TelepathyQt4/ChannelClassSpecList>
+#include <TelepathyQt4/ChannelDispatchOperation>
#include <TelepathyQt4/Connection>
#include <TelepathyQt4/PendingOperation>
#include <TelepathyQt4/PendingReady>
#include <TelepathyQt4/Debug>
-#include <KApplication>
-#include <KDebug>
-
-static inline Tp::ChannelClassList channelClassList()
+static inline Tp::ChannelClassSpecList channelClassSpecList()
{
- QMap<QString, QDBusVariant> filter0;
- filter0[TELEPATHY_INTERFACE_CHANNEL ".ChannelType"] =
- QDBusVariant(TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAM_TUBE);
- filter0[TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAM_TUBE ".Service"] = \
QDBusVariant("rfb");
- filter0[TELEPATHY_INTERFACE_CHANNEL ".Requested"] = QDBusVariant(false);
-
- return Tp::ChannelClassList() << Tp::ChannelClass(filter0);
+ Tp::ChannelClassSpec spec = Tp::ChannelClassSpec();
+ spec.setChannelType(TP_QT4_IFACE_CHANNEL_TYPE_STREAM_TUBE);
+ spec.setTargetHandleType(Tp::HandleTypeContact);
+ spec.setRequested(false);
+ spec.setProperty(QLatin1String(TP_QT4_IFACE_CHANNEL_TYPE_STREAM_TUBE \
".Service"), + QVariant("rfb"));
+ return Tp::ChannelClassSpecList() << spec;
}
ApproverManager::ApproverManager(QObject *parent)
: QObject(parent),
- AbstractClientApprover(channelClassList())
+ AbstractClientApprover(channelClassSpecList())
{
kDebug() << "Initializing approver manager";
}
@@ -60,12 +63,11 @@
}
void ApproverManager::addDispatchOperation(const Tp::MethodInvocationContextPtr<> \
&context,
- const QList<Tp::ChannelPtr> &channels,
const Tp::ChannelDispatchOperationPtr &dispatchOperation)
{
kDebug() << "New channel for approving arrived";
- Approver *approver = new Approver(context, channels, dispatchOperation, this);
+ Approver *approver = new Approver(context, dispatchOperation->channels(), \
dispatchOperation, this); connect(approver, SIGNAL(finished()), SLOT(onFinished()));
m_approvers << approver;
--- trunk/KDE/kdenetwork/krdc/krdc_approver/approvermanager.h #1221585:1221586
@@ -38,7 +38,6 @@
virtual ~ApproverManager();
virtual void addDispatchOperation(const Tp::MethodInvocationContextPtr<> \
&context,
- const QList<Tp::ChannelPtr> &channels,
const Tp::ChannelDispatchOperationPtr &dispatchOperation);
private Q_SLOTS:
--- trunk/KDE/kdenetwork/krdc/tube.cpp #1221585:1221586
@@ -70,10 +70,10 @@
const QString&)));
/* Interface used to control the tube state */
- m_tubeInterface = m_channel->tubeInterface();
+ m_tubeInterface = \
m_channel->interface<Tp::Client::ChannelInterfaceTubeInterface>();
/* Interface used to control stream tube */
- m_streamTubeInterface = m_channel->streamTubeInterface();
+ m_streamTubeInterface = \
m_channel->interface<Tp::Client::ChannelTypeStreamTubeInterface>();
if (m_streamTubeInterface && m_tubeInterface) {
kDebug() << "Accepting tube";
--- trunk/KDE/kdenetwork/krdc/tubesmanager.cpp #1221585:1221586
@@ -24,24 +24,25 @@
#include "tubesmanager.h"
+#include <TelepathyQt4/ChannelClassSpecList>
#include <TelepathyQt4/Debug>
#include <KDebug>
-static inline Tp::ChannelClassList channelClassList()
+static inline Tp::ChannelClassSpecList channelClassSpecList()
{
- QMap<QString, QDBusVariant> filter0;
- filter0[TELEPATHY_INTERFACE_CHANNEL ".ChannelType"] =
- QDBusVariant(TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAM_TUBE);
- filter0[TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAM_TUBE ".Service"] = \
QDBusVariant("rfb");
- filter0[TELEPATHY_INTERFACE_CHANNEL ".Requested"] = QDBusVariant(false);
-
- return Tp::ChannelClassList() << Tp::ChannelClass(filter0);
+ Tp::ChannelClassSpec spec = Tp::ChannelClassSpec();
+ spec.setChannelType(TP_QT4_IFACE_CHANNEL_TYPE_STREAM_TUBE);
+ spec.setTargetHandleType(Tp::HandleTypeContact);
+ spec.setRequested(false);
+ spec.setProperty(QLatin1String(TP_QT4_IFACE_CHANNEL_TYPE_STREAM_TUBE \
".Service"), + QVariant("rfb"));
+ return Tp::ChannelClassSpecList() << spec;
}
TubesManager::TubesManager(QObject *parent)
: QObject(parent),
- AbstractClientHandler(channelClassList(), false)
+ AbstractClientHandler(channelClassSpecList())
{
kDebug() << "Initializing tubes manager";
@@ -69,7 +70,7 @@
const QList<Tp::ChannelPtr> & channels,
const QList<Tp::ChannelRequestPtr> & requestsSatisfied,
const QDateTime & userActionTime,
- const QVariantMap & handlerInfo)
+ const Tp::AbstractClientHandler::HandlerInfo & handlerInfo)
{
Q_UNUSED(account);
Q_UNUSED(connection);
--- trunk/KDE/kdenetwork/krdc/tubesmanager.h #1221585:1221586
@@ -48,7 +48,7 @@
const QList<Tp::ChannelPtr> & channels,
const QList<Tp::ChannelRequestPtr> & requestsSatisfied,
const QDateTime & userActionTime,
- const QVariantMap & handlerInfo);
+ const Tp::AbstractClientHandler::HandlerInfo & handlerInfo);
private Q_SLOTS:
void onTubeStateChanged(Tube::Status);
--- trunk/KDE/kdenetwork/krfb/krfb/tubesclienthandler.cpp #1221585:1221586
@@ -21,6 +21,7 @@
#include "tubesclienthandler.h"
#include "tubesrfbserver.h"
+#include <TelepathyQt4/ChannelClassSpecList>
#include <TelepathyQt4/Constants>
#include <TelepathyQt4/Debug>
@@ -28,19 +29,18 @@
using namespace Tp;
-static inline Tp::ChannelClassList channelClassList()
+static inline Tp::ChannelClassSpecList channelClassSpecList()
{
- QMap<QString, QDBusVariant> filter0;
- filter0[TELEPATHY_INTERFACE_CHANNEL ".ChannelType"] =
- QDBusVariant(TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAM_TUBE);
- filter0[TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAM_TUBE ".Service"] = \
QDBusVariant("rfb");
- filter0[TELEPATHY_INTERFACE_CHANNEL ".Requested"] = QDBusVariant(true);
-
- return Tp::ChannelClassList() << Tp::ChannelClass(filter0);
+ Tp::ChannelClassSpec spec = Tp::ChannelClassSpec();
+ spec.setChannelType(TP_QT4_IFACE_CHANNEL_TYPE_STREAM_TUBE);
+ spec.setTargetHandleType(Tp::HandleTypeContact);
+ spec.setRequested(true);
+ spec.setProperty(QLatin1String(TP_QT4_IFACE_CHANNEL_TYPE_STREAM_TUBE \
".Service"),QVariant("rfb")); + return Tp::ChannelClassSpecList() << spec;
}
TubesClientHandler::TubesClientHandler()
- : AbstractClientHandler(channelClassList(), false)
+ : AbstractClientHandler(channelClassSpecList())
{
kDebug();
@@ -68,7 +68,7 @@
const QList<Tp::ChannelPtr> &channels,
const QList<Tp::ChannelRequestPtr> \
&requestsSatisfied, const QDateTime &userActionTime,
- const QVariantMap &handlerInfo)
+ const Tp::AbstractClientHandler::HandlerInfo \
&handlerInfo) {
kDebug();
--- trunk/KDE/kdenetwork/krfb/krfb/tubesclienthandler.h #1221585:1221586
@@ -36,7 +36,7 @@
const QList<Tp::ChannelPtr> &channels,
const QList<Tp::ChannelRequestPtr> \
&requestsSatisfied, const QDateTime &userActionTime,
- const QVariantMap &handlerInfo);
+ const Tp::AbstractClientHandler::HandlerInfo \
&handlerInfo);
};
--- trunk/KDE/kdenetwork/krfb/krfb/tubesrfbserver.cpp #1221585:1221586
@@ -143,7 +143,7 @@
Tp::Contacts contacts = d->channel->groupContacts();
- Tp::ContactManager *contactManager = d->channel->connection()->contactManager();
+ Tp::ContactManagerPtr contactManager = \
d->channel->connection()->contactManager();
if (!contactManager) {
kWarning() << "Invalid Contact Manager.";
@@ -154,7 +154,7 @@
return;
}
- QSet<Tp::Contact::Feature> features;
+ Tp::Features features;
features << Tp::Contact::FeatureAlias;
connect(contactManager->upgradeContacts(contacts.toList(), features),
@@ -198,10 +198,10 @@
const QString&)));
/* Interface used to control the tube state */
- Tp::Client::ChannelInterfaceTubeInterface *tubeInterface = \
d->channel->tubeInterface(); + Tp::Client::ChannelInterfaceTubeInterface \
*tubeInterface = d->channel->interface<Tp::Client::ChannelInterfaceTubeInterface>(); \
/* Interface used to control stream tube */
- Tp::Client::ChannelTypeStreamTubeInterface *streamTubeInterface = \
d->channel->streamTubeInterface(); + Tp::Client::ChannelTypeStreamTubeInterface \
*streamTubeInterface = \
d->channel->interface<Tp::Client::ChannelTypeStreamTubeInterface>();
if (streamTubeInterface && tubeInterface) {
kDebug() << "Offering tube";
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic