Merge lp:~tiagosh/ubuntu/wily/telepathy-qt5/update-0.9.6.1 into lp:ubuntu/wily/telepathy-qt5

[Tiago Salem Herrmann]

Update to new upstream release (0.9.6.1).

Update to new upstream release (0.9.6.1).

[Martin Pitt (pitti)]

The changelog doesn't document/justify the dropping of all patches. I went through them, and most seem to be applied upstream. 02-adapt_to_work_with_q5_final.patch and 05-fix-qt52-build.patch don't seem to be applied at all, but the package builds fine in wily (with Qt 5.4), so I assume they are obsolete.

Please document this in the changelog next time instead of requiring such guesswork.

Uploaded, thanks!

review: Approve

=== removed directory '.pc/01-force_setInterfaces_on_call-content-for-dtmf.patch'
=== removed directory '.pc/01-force_setInterfaces_on_call-content-for-dtmf.patch/TelepathyQt'
=== removed file '.pc/01-force_setInterfaces_on_call-content-for-dtmf.patch/TelepathyQt/call-content.cpp'
--- .pc/01-force_setInterfaces_on_call-content-for-dtmf.patch/TelepathyQt/call-content.cpp	2013-06-06 04:56:14 +0000
+++ .pc/01-force_setInterfaces_on_call-content-for-dtmf.patch/TelepathyQt/call-content.cpp	1970-01-01 00:00:00 +0000
@@ -1,537 +0,0 @@
-/*
- * This file is part of TelepathyQt
- *
- * @copyright Copyright (C) 2010-2012 Collabora Ltd. <http://www.collabora.co.uk/>
- * @copyright Copyright (C) 2012 Nokia Corporation
- * @license LGPL 2.1
- *
- * 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 <TelepathyQt/CallContent>
-
-#include "TelepathyQt/_gen/call-content.moc.hpp"
-
-#include "TelepathyQt/_gen/cli-call-content-body.hpp"
-#include "TelepathyQt/_gen/cli-call-content.moc.hpp"
-
-#include <TelepathyQt/debug-internal.h>
-
-#include <TelepathyQt/CallChannel>
-#include <TelepathyQt/DBus>
-#include <TelepathyQt/PendingReady>
-#include <TelepathyQt/PendingVoid>
-#include <TelepathyQt/PendingVariantMap>
-#include <TelepathyQt/ReadinessHelper>
-
-namespace Tp
-{
-
-/* ====== CallContent ====== */
-struct TP_QT_NO_EXPORT CallContent::Private
-{
-    Private(CallContent *parent, const CallChannelPtr &channel);
-
-    static void introspectMainProperties(Private *self);
-    void checkIntrospectionCompleted();
-
-    CallStreamPtr addStream(const QDBusObjectPath &streamPath);
-    CallStreamPtr lookupStream(const QDBusObjectPath &streamPath);
-
-    // Public object
-    CallContent *parent;
-
-    WeakPtr<CallChannel> channel;
-
-    // Mandatory proxies
-    Client::CallContentInterface *contentInterface;
-
-    ReadinessHelper *readinessHelper;
-
-    // Introspection
-    QString name;
-    uint type;
-    uint disposition;
-    CallStreams streams;
-    CallStreams incompleteStreams;
-};
-
-CallContent::Private::Private(CallContent *parent, const CallChannelPtr &channel)
-    : parent(parent),
-      channel(channel.data()),
-      contentInterface(parent->interface<Client::CallContentInterface>()),
-      readinessHelper(parent->readinessHelper())
-{
-    ReadinessHelper::Introspectables introspectables;
-
-    ReadinessHelper::Introspectable introspectableCore(
-        QSet<uint>() << 0,                                                         // makesSenseForStatuses
-        Features(),                                                            // dependsOnFeatures
-        QStringList(),                                                             // dependsOnInterfaces
-        (ReadinessHelper::IntrospectFunc) &Private::introspectMainProperties,
-        this);
-    introspectables[FeatureCore] = introspectableCore;
-
-    readinessHelper->addIntrospectables(introspectables);
-    readinessHelper->becomeReady(FeatureCore);
-}
-
-void CallContent::Private::introspectMainProperties(CallContent::Private *self)
-{
-    CallContent *parent = self->parent;
-    CallChannelPtr channel = parent->channel();
-
-    parent->connect(self->contentInterface,
-            SIGNAL(StreamsAdded(Tp::ObjectPathList)),
-            SLOT(onStreamsAdded(Tp::ObjectPathList)));
-    parent->connect(self->contentInterface,
-            SIGNAL(StreamsRemoved(Tp::ObjectPathList,Tp::CallStateReason)),
-            SLOT(onStreamsRemoved(Tp::ObjectPathList,Tp::CallStateReason)));
-
-    parent->connect(self->contentInterface->requestAllProperties(),
-            SIGNAL(finished(Tp::PendingOperation*)),
-            SLOT(gotMainProperties(Tp::PendingOperation*)));
-}
-
-void CallContent::Private::checkIntrospectionCompleted()
-{
-    if (!parent->isReady(FeatureCore) && incompleteStreams.size() == 0) {
-        readinessHelper->setIntrospectCompleted(FeatureCore, true);
-    }
-}
-
-CallStreamPtr CallContent::Private::addStream(const QDBusObjectPath &streamPath)
-{
-    CallStreamPtr stream = CallStreamPtr(
-            new CallStream(CallContentPtr(parent), streamPath));
-    incompleteStreams.append(stream);
-    parent->connect(stream->becomeReady(),
-            SIGNAL(finished(Tp::PendingOperation*)),
-            SLOT(onStreamReady(Tp::PendingOperation*)));
-    return stream;
-}
-
-CallStreamPtr CallContent::Private::lookupStream(const QDBusObjectPath &streamPath)
-{
-    foreach (const CallStreamPtr &stream, streams) {
-        if (stream->objectPath() == streamPath.path()) {
-            return stream;
-        }
-    }
-    foreach (const CallStreamPtr &stream, incompleteStreams) {
-        if (stream->objectPath() == streamPath.path()) {
-            return stream;
-        }
-    }
-    return CallStreamPtr();
-}
-
-/**
- * \class CallContent
- * \ingroup clientchannel
- * \headerfile TelepathyQt/call-content.h <TelepathyQt/CallContent>
- *
- * \brief The CallContent class provides an object representing a Telepathy
- * Call.Content.
- *
- * Instances of this class cannot be constructed directly; the only way to get
- * one is via CallChannel.
- *
- * See \ref async_model
- */
-
-/**
- * Feature representing the core that needs to become ready to make the
- * CallContent object usable.
- *
- * Note that this feature must be enabled in order to use most CallContent
- * methods. See specific methods documentation for more details.
- *
- * When calling isReady(), becomeReady(), this feature is implicitly added
- * to the requested features.
- */
-const Feature CallContent::FeatureCore = Feature(QLatin1String(CallContent::staticMetaObject.className()), 0);
-
-/**
- * Construct a new CallContent object.
- *
- * \param channel The channel owning this media content.
- * \param name The object path of this media content.
- */
-CallContent::CallContent(const CallChannelPtr &channel, const QDBusObjectPath &objectPath)
-    : StatefulDBusProxy(channel->dbusConnection(), channel->busName(),
-            objectPath.path(), FeatureCore),
-      OptionalInterfaceFactory<CallContent>(this),
-      mPriv(new Private(this, channel))
-{
-}
-
-/**
- * Class destructor.
- */
-CallContent::~CallContent()
-{
-    delete mPriv;
-}
-
-/**
- * Return the channel owning this media content.
- *
- * \return The channel owning this media content.
- */
-CallChannelPtr CallContent::channel() const
-{
-    return CallChannelPtr(mPriv->channel);
-}
-
-/**
- * Return the name of this media content.
- *
- * \return The name of this media content.
- */
-QString CallContent::name() const
-{
-    return mPriv->name;
-}
-
-/**
- * Return the type of this media content.
- *
- * \return The type of this media content.
- */
-MediaStreamType CallContent::type() const
-{
-    return (MediaStreamType) mPriv->type;
-}
-
-/**
- * Return the disposition of this media content.
- *
- * \return The disposition of this media content.
- */
-CallContentDisposition CallContent::disposition() const
-{
-    return (CallContentDisposition) mPriv->disposition;
-}
-
-/**
- * Return the media streams of this media content.
- *
- * \return A list of media streams of this media content.
- * \sa streamAdded(), streamRemoved()
- */
-CallStreams CallContent::streams() const
-{
-    return mPriv->streams;
-}
-
-/**
- * Removes this media content from the call.
- *
- * \return A PendingOperation which will emit PendingOperation::finished
- *         when the call has finished.
- */
-PendingOperation *CallContent::remove()
-{
-    return new PendingVoid(mPriv->contentInterface->Remove(), CallContentPtr(this));
-}
-
-/**
- * Return whether sending DTMF events is supported on this content.
- * DTMF is only supported on audio contents that implement the
- * #TP_QT_IFACE_CALL_CONTENT_INTERFACE_DTMF interface.
- *
- * \returns \c true if DTMF is supported, or \c false otherwise.
- */
-bool CallContent::supportsDTMF() const
-{
-    return hasInterface(TP_QT_IFACE_CALL_CONTENT_INTERFACE_DTMF);
-}
-
-/**
- * Start sending a DTMF tone on this media stream.
- *
- * Where possible, the tone will continue until stopDTMFTone() is called.
- * On certain protocols, it may only be possible to send events with a predetermined
- * length. In this case, the implementation may emit a fixed-length tone,
- * and the stopDTMFTone() method call should return #TP_QT_ERROR_NOT_AVAILABLE.
- *
- * If this content does not support the #TP_QT_IFACE_CALL_CONTENT_INTERFACE_DTMF
- * interface, the resulting PendingOperation will fail with error code
- * #TP_QT_ERROR_NOT_IMPLEMENTED.
- *
- * \param event A numeric event code from the #DTMFEvent enum.
- * \return A PendingOperation which will emit PendingOperation::finished
- *         when the request finishes.
- * \sa stopDTMFTone(), supportsDTMF()
- */
-PendingOperation *CallContent::startDTMFTone(DTMFEvent event)
-{
-    if (!supportsDTMF()) {
-        warning() << "CallContent::startDTMFTone() used with no dtmf interface";
-        return new PendingFailure(TP_QT_ERROR_NOT_IMPLEMENTED,
-                QLatin1String("This CallContent does not support the dtmf interface"),
-                CallContentPtr(this));
-    }
-
-    Client::CallContentInterfaceDTMFInterface *dtmfInterface =
-        interface<Client::CallContentInterfaceDTMFInterface>();
-    return new PendingVoid(dtmfInterface->StartTone(event), CallContentPtr(this));
-}
-
-/**
- * Stop sending any DTMF tone which has been started using the startDTMFTone()
- * method.
- *
- * If there is no current tone, the resulting PendingOperation will
- * finish successfully.
- *
- * If this content does not support the #TP_QT_IFACE_CALL_CONTENT_INTERFACE_DTMF
- * interface, the resulting PendingOperation will fail with error code
- * #TP_QT_ERROR_NOT_IMPLEMENTED.
- *
- * \return A PendingOperation which will emit PendingOperation::finished
- *         when the request finishes.
- * \sa startDTMFTone(), supportsDTMF()
- */
-PendingOperation *CallContent::stopDTMFTone()
-{
-    if (!supportsDTMF()) {
-        warning() << "CallContent::stopDTMFTone() used with no dtmf interface";
-        return new PendingFailure(TP_QT_ERROR_NOT_IMPLEMENTED,
-                QLatin1String("This CallContent does not support the dtmf interface"),
-                CallContentPtr(this));
-    }
-
-    Client::CallContentInterfaceDTMFInterface *dtmfInterface =
-        interface<Client::CallContentInterfaceDTMFInterface>();
-    return new PendingVoid(dtmfInterface->StopTone(), CallContentPtr(this));
-}
-
-void CallContent::gotMainProperties(PendingOperation *op)
-{
-    if (op->isError()) {
-        warning().nospace() << "CallContentInterface::requestAllProperties() failed with" <<
-            op->errorName() << ": " << op->errorMessage();
-        mPriv->readinessHelper->setIntrospectCompleted(FeatureCore, false,
-            op->errorName(), op->errorMessage());
-        return;
-    }
-
-    debug() << "Got reply to CallContentInterface::requestAllProperties()";
-
-    PendingVariantMap *pvm = qobject_cast<PendingVariantMap*>(op);
-    Q_ASSERT(pvm);
-
-    QVariantMap props = pvm->result();
-
-    mPriv->name = qdbus_cast<QString>(props[QLatin1String("Name")]);
-    mPriv->type = qdbus_cast<uint>(props[QLatin1String("Type")]);
-    mPriv->disposition = qdbus_cast<uint>(props[QLatin1String("Disposition")]);
-
-    ObjectPathList streamsPaths = qdbus_cast<ObjectPathList>(props[QLatin1String("Streams")]);
-    if (streamsPaths.size() != 0) {
-        foreach (const QDBusObjectPath &streamPath, streamsPaths) {
-            CallStreamPtr stream = mPriv->lookupStream(streamPath);
-            if (!stream) {
-                mPriv->addStream(streamPath);
-            }
-        }
-    } else {
-        mPriv->readinessHelper->setIntrospectCompleted(FeatureCore, true);
-    }
-}
-
-void CallContent::onStreamsAdded(const ObjectPathList &streamsPaths)
-{
-    foreach (const QDBusObjectPath &streamPath, streamsPaths) {
-        debug() << "Received Call::Content::StreamAdded for stream" << streamPath.path();
-
-        if (mPriv->lookupStream(streamPath)) {
-            debug() << "Stream already exists, ignoring";
-            return;
-        }
-
-        mPriv->addStream(streamPath);
-    }
-}
-
-void CallContent::onStreamsRemoved(const ObjectPathList &streamsPaths,
-        const CallStateReason &reason)
-{
-    foreach (const QDBusObjectPath &streamPath, streamsPaths) {
-        debug() << "Received Call::Content::StreamRemoved for stream" << streamPath.path();
-
-        CallStreamPtr stream = mPriv->lookupStream(streamPath);
-        if (!stream) {
-            debug() << "Stream does not exist, ignoring";
-            return;
-        }
-
-        bool incomplete = mPriv->incompleteStreams.contains(stream);
-        if (incomplete) {
-            mPriv->incompleteStreams.removeOne(stream);
-        } else {
-            mPriv->streams.removeOne(stream);
-        }
-
-        if (isReady(FeatureCore) && !incomplete) {
-            emit streamRemoved(stream, reason);
-        }
-
-        mPriv->checkIntrospectionCompleted();
-    }
-}
-
-void CallContent::onStreamReady(PendingOperation *op)
-{
-    PendingReady *pr = qobject_cast<PendingReady*>(op);
-    CallStreamPtr stream = CallStreamPtr::qObjectCast(pr->proxy());
-
-    if (op->isError() || !mPriv->incompleteStreams.contains(stream)) {
-        mPriv->incompleteStreams.removeOne(stream);
-        mPriv->checkIntrospectionCompleted();
-        return;
-    }
-
-    mPriv->incompleteStreams.removeOne(stream);
-    mPriv->streams.append(stream);
-
-    if (isReady(FeatureCore)) {
-        emit streamAdded(stream);
-    }
-
-    mPriv->checkIntrospectionCompleted();
-}
-
-/**
- * \fn void CallContent::streamAdded(const Tp::CallStreamPtr &stream);
- *
- * This signal is emitted when a new media stream is added to this media
- * content.
- *
- * \param stream The media stream that was added.
- * \sa streams()
- */
-
-/**
- * \fn void CallContent::streamRemoved(const Tp::CallStreamPtr &stream, const Tp::CallStateReason &reason);
- *
- * This signal is emitted when a new media stream is removed from this media
- * content.
- *
- * \param stream The media stream that was removed.
- * \param reason The reason for this removal.
- * \sa streams()
- */
-
-
-/* ====== PendingCallContent ====== */
-struct TP_QT_NO_EXPORT PendingCallContent::Private
-{
-    Private(PendingCallContent *parent, const CallChannelPtr &channel)
-        : parent(parent),
-          channel(channel)
-    {
-    }
-
-    PendingCallContent *parent;
-    CallChannelPtr channel;
-    CallContentPtr content;
-};
-
-PendingCallContent::PendingCallContent(const CallChannelPtr &channel,
-        const QString &name, MediaStreamType type, MediaStreamDirection direction)
-    : PendingOperation(channel),
-      mPriv(new Private(this, channel))
-{
-    Client::ChannelTypeCallInterface *callInterface =
-        channel->interface<Client::ChannelTypeCallInterface>();
-    QDBusPendingCallWatcher *watcher =
-        new QDBusPendingCallWatcher(
-                callInterface->AddContent(name, type, direction), this);
-    connect(watcher,
-            SIGNAL(finished(QDBusPendingCallWatcher*)),
-            SLOT(gotContent(QDBusPendingCallWatcher*)));
-}
-
-PendingCallContent::~PendingCallContent()
-{
-    delete mPriv;
-}
-
-CallContentPtr PendingCallContent::content() const
-{
-    if (!isFinished() || !isValid()) {
-        return CallContentPtr();
-    }
-
-    return mPriv->content;
-}
-
-void PendingCallContent::gotContent(QDBusPendingCallWatcher *watcher)
-{
-    QDBusPendingReply<QDBusObjectPath> reply = *watcher;
-    if (reply.isError()) {
-        warning().nospace() << "Call::AddContent failed with " <<
-            reply.error().name() << ": " << reply.error().message();
-        setFinishedWithError(reply.error());
-        watcher->deleteLater();
-        return;
-    }
-
-    QDBusObjectPath contentPath = reply.value();
-    CallChannelPtr channel(mPriv->channel);
-    CallContentPtr content = channel->lookupContent(contentPath);
-    if (!content) {
-        content = channel->addContent(contentPath);
-    }
-
-    connect(content->becomeReady(),
-            SIGNAL(finished(Tp::PendingOperation*)),
-            SLOT(onContentReady(Tp::PendingOperation*)));
-    connect(channel.data(),
-            SIGNAL(contentRemoved(Tp::CallContentPtr,Tp::CallStateReason)),
-            SLOT(onContentRemoved(Tp::CallContentPtr)));
-
-    mPriv->content = content;
-
-    watcher->deleteLater();
-}
-
-void PendingCallContent::onContentReady(PendingOperation *op)
-{
-    if (op->isError()) {
-        setFinishedWithError(op->errorName(), op->errorMessage());
-        return;
-    }
-
-    setFinished();
-}
-
-void PendingCallContent::onContentRemoved(const CallContentPtr &content)
-{
-    if (isFinished()) {
-        return;
-    }
-
-    if (mPriv->content == content) {
-        // the content was removed before becoming ready
-        setFinishedWithError(TP_QT_ERROR_CANCELLED,
-                QLatin1String("Content removed before ready"));
-    }
-}
-
-} // Tp
 
=== removed directory '.pc/02-adapt_to_work_with_q5_final.patch'
=== removed file '.pc/02-adapt_to_work_with_q5_final.patch/CMakeLists.txt'
--- .pc/02-adapt_to_work_with_q5_final.patch/CMakeLists.txt	2013-06-06 04:56:14 +0000
+++ .pc/02-adapt_to_work_with_q5_final.patch/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,304 +0,0 @@
-project(TelepathyQt)
-
-cmake_minimum_required(VERSION 2.6)
-
-# CMake policies are used for backwards compatibilty. Setting a policy to a behavior lets newer
-# CMake versions where some behaviors changed behave in a way or another. In our specific case,
-# From CMake's documentation:
-#
-# In CMake 2.6.2 and below, CMake Policy settings in scripts loaded by
-# the include() and find_package() commands would affect the includer.
-# Explicit invocations of cmake_policy(PUSH) and cmake_policy(POP) were
-# required to isolate policy changes and protect the includer.  While
-# some scripts intend to affect the policies of their includer, most do
-# not.  In CMake 2.6.3 and above, include() and find_package() by
-# default PUSH and POP an entry on the policy stack around an included
-# script, but provide a NO_POLICY_SCOPE option to disable it.  This
-# policy determines whether or not to imply NO_POLICY_SCOPE for
-# compatibility.  The OLD behavior for this policy is to imply
-# NO_POLICY_SCOPE for include() and find_package() commands.  The NEW
-# behavior for this policy is to allow the commands to do their default
-# cmake_policy PUSH and POP.
-#
-# This policy was introduced in CMake version 2.6.3.  CMake version
-# 2.8.2 warns when the policy is not set and uses OLD behavior.  Use the
-# cmake_policy command to set it to OLD or NEW explicitly.
-#
-# Whenever our cmake_minimum_required version bumps up to 2.7 or 2.6.3, this policy setting can
-# hence be removed.
-if(POLICY CMP0011)
-    cmake_policy(SET CMP0011 NEW)
-endif(POLICY CMP0011)
-
-# Making releases:
-#   set the new version number:
-#     odd minor -> development series
-#     even minor -> stable series
-#     increment micro for each release within a series
-#   set nano_version to 0
-#   make the release, tag it
-#   set nano_version to 1
-set(TP_QT_MAJOR_VERSION 0)
-set(TP_QT_MINOR_VERSION 9)
-set(TP_QT_MICRO_VERSION 3)
-set(TP_QT_NANO_VERSION  0)
-
-set(PACKAGE_NAME telepathy-qt)
-
-if (${TP_QT_NANO_VERSION} EQUAL 0)
-    set(PACKAGE_VERSION ${TP_QT_MAJOR_VERSION}.${TP_QT_MINOR_VERSION}.${TP_QT_MICRO_VERSION})
-else (${TP_QT_NANO_VERSION} EQUAL 0)
-    set(PACKAGE_VERSION ${TP_QT_MAJOR_VERSION}.${TP_QT_MINOR_VERSION}.${TP_QT_MICRO_VERSION}.${TP_QT_NANO_VERSION})
-endif (${TP_QT_NANO_VERSION} EQUAL 0)
-
-# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is
-# checked
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
-
-# Default build type is RelWithDebInfo for release versions and Debug for developement
-# versions
-if(NOT CMAKE_BUILD_TYPE)
-    if(TP_QT_NANO_VERSION EQUAL 0)
-        set(CMAKE_BUILD_TYPE RelWithDebInfo)
-    else(TP_QT_NANO_VERSION EQUAL 0)
-        set(CMAKE_BUILD_TYPE Debug)
-    endif(TP_QT_NANO_VERSION EQUAL 0)
-endif(NOT CMAKE_BUILD_TYPE)
-
-# This file contains all the needed initialization macros
-include(TelepathyDefaults)
-
-# This file contains all the tpqt macros used in the buildsystem
-include(TpQtMacros)
-
-include(MacroLogFeature)
-
-# external dependencies
-
-# Required dependencies
-# Find qt4 version >= 4.6 or qt5 >= 5.0.0
-set(QT4_MIN_VERSION "4.6.0")
-set(QT4_MAX_VERSION "5.0.0")
-set(QT5_MIN_VERSION "5.0.0")
-set(QT5_MAX_VERSION "6.0.0")
-find_package(Qt REQUIRED)
-
-foreach(flag ${QT_CONFIG_FLAGS})
-    if (${flag} MATCHES "reduce_relocations")
-        set(TP_QT_EXECUTABLE_LINKER_FLAGS "-fPIE")
-        set(TP_QT_LIBRARY_LINKER_FLAGS "-fPIC")
-    endif (${flag} MATCHES "reduce_relocations")
-endforeach(flag ${QT_CONFIG_FLAGS})
-
-# This value contains the library's SOVERSION. This value is to be increased everytime an API/ABI break
-# occurs, and will be used for the SOVERSION of the generated shared libraries.
-if (${QT_VERSION_MAJOR} EQUAL 4)
-    set(TP_QT_ABI_VERSION 2)
-else (${QT_VERSION_MAJOR} EQUAL 4)
-    set(TP_QT_ABI_VERSION 0)
-endif (${QT_VERSION_MAJOR} EQUAL 4)
-
-# This variable is used for the library's long version. It is generated dynamically, so don't change its
-# value! Change TP_QT_ABI_VERSION and TP_QT_*_VERSION instead.
-if (${TP_QT_NANO_VERSION} EQUAL 0)
-    set(TP_QT_LIBRARY_VERSION ${TP_QT_ABI_VERSION}.${TP_QT_MAJOR_VERSION}.${TP_QT_MINOR_VERSION}.${TP_QT_MICRO_VERSION})
-else (${TP_QT_NANO_VERSION} EQUAL 0)
-    set(TP_QT_LIBRARY_VERSION ${TP_QT_ABI_VERSION}.${TP_QT_MAJOR_VERSION}.${TP_QT_MINOR_VERSION}.${TP_QT_MICRO_VERSION}.${TP_QT_NANO_VERSION})
-endif (${TP_QT_NANO_VERSION} EQUAL 0)
-
-# Add an option for compiling tp-qt-service
-option(ENABLE_EXPERIMENTAL_SERVICE_SUPPORT "Enable compilation of experimental and unstable service side bindings for Telepathy-Qt" FALSE)
-# Add an option for compiling examples
-option(ENABLE_EXAMPLES "Enable compilation of examples for Telepathy-Qt" TRUE)
-# Add an option for compiling Farsight (disabled by default)
-option(ENABLE_FARSIGHT "Enable compilation of Farsight bindings (deprecated)" FALSE)
-# Add an option for compiling Farstream
-option(ENABLE_FARSTREAM "Enable compilation of Farstream bindings" TRUE)
-# Add an option for building tests
-option(ENABLE_TESTS "Enable compilation of automated tests" TRUE)
-
-if (ENABLE_EXPERIMENTAL_SERVICE_SUPPORT)
-    message(STATUS "You have enabled experimental service support for Telepathy-Qt. Be aware there are no guarantees of API stability yet for service-side classes.")
-endif (ENABLE_EXPERIMENTAL_SERVICE_SUPPORT)
-
-# The doxygen macro requires Qt to have been looked up to enable crosslinking
-include(Doxygen)
-
-include_directories(${CMAKE_SOURCE_DIR}
-                    ${CMAKE_BINARY_DIR}
-                    ${QT_INCLUDES})
-
-add_definitions(-DQT_NO_CAST_FROM_ASCII)
-
-set(ENABLE_DEBUG_OUTPUT ON CACHE BOOL "If activated, compiles support for printing debug output to stderr")
-if (ENABLE_DEBUG_OUTPUT)
-    add_definitions(-DENABLE_DEBUG)
-endif (ENABLE_DEBUG_OUTPUT)
-
-# Check for Qt Glib support
-include(CheckCXXSourceCompiles)
-set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES})
-set(CMAKE_REQUIRED_DEFINITIONS "")
-# set the flags (-fPIE) here so that CHECK_CXX_SOURCE_COMPILES works properly if qt5 was built with
-# -reduce-locations
-set(CMAKE_REQUIRED_FLAGS "${TP_QT_EXECUTABLE_LINKER_FLAGS}")
-
-CHECK_CXX_SOURCE_COMPILES("
-#include <QtCore/QtGlobal>
-int main()
-{
-#if defined(QT_NO_GLIB)
-#error \"Qt was compiled with Glib disabled\"
-#endif
-return 0;
-}"
-QT_GLIB_SUPPORT)
-macro_log_feature(QT_GLIB_SUPPORT "Qt Glib Support"
-                  "QtCore library using Glib's main event loop"
-                  "http://qt.nokia.com/" FALSE ""
-                  "Needed, together with Telepathy-Glib, to build most of the unit tests")
-
-# reset flags
-set(CMAKE_REQUIRED_FLAGS "")
-
-# Find python version >= 2.5
-find_package(PythonLibrary REQUIRED)
-set(REQUIRED_PY 2.5)
-if(${PYTHON_SHORT_VERSION} VERSION_GREATER ${REQUIRED_PY} OR ${PYTHON_SHORT_VERSION} VERSION_EQUAL ${REQUIRED_PY})
-    message(STATUS "Python ${PYTHON_SHORT_VERSION} found")
-else(${PYTHON_SHORT_VERSION} VERSION_GREATER ${REQUIRED_PY} OR ${PYTHON_SHORT_VERSION} VERSION_EQUAL ${REQUIRED_PY})
-    message(SEND_ERROR "Python >= ${REQUIRED_PY} is required")
-endif(${PYTHON_SHORT_VERSION} VERSION_GREATER ${REQUIRED_PY} OR ${PYTHON_SHORT_VERSION} VERSION_EQUAL ${REQUIRED_PY})
-
-# Check for dbus-python
-execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "import dbus.mainloop.glib"
-                RESULT_VARIABLE PYTHON_DBUS_RESULT)
-if(PYTHON_DBUS_RESULT EQUAL 0)
-    set(HAVE_TEST_PYTHON 1)
-else(PYTHON_DBUS_RESULT EQUAL 0)
-    set(HAVE_TEST_PYTHON 0)
-endif(PYTHON_DBUS_RESULT EQUAL 0)
-macro_log_feature(HAVE_TEST_PYTHON "dbus-python"
-                  "GLib-based Python DBus support"
-                  "http://www.python.org/" FALSE ""
-                  "Needed to build some additional unit tests")
-
-if(ENABLE_TESTS OR ENABLE_FARSTREAM OR ENABLE_FARSIGHT)
-    # Find telepathy-glib
-    set(TELEPATHY_GLIB_MIN_VERSION 0.17.5)
-    find_package(TelepathyGlib)
-    macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib"
-                      "Glib bindings for Telepathy"
-                      "http://telepathy.freedesktop.org/" FALSE ${TELEPATHY_GLIB_MIN_VERSION}
-                      "Needed, together with Qt Glib integration, to build most of the unit tests")
-
-    find_program(GLIB_GENMARSHAL glib-genmarshal)
-
-    # Find GLib2, GObject, DBus and LibXml2
-    # Those are needed for the insane include dir dependency hell
-    find_package(GLIB2)
-    find_package(GObject)
-    find_package(GIO)
-    find_package(GIOUnix)
-    find_package(DBus)
-    find_package(DBusGLib)
-    find_package(LibXml2)
-endif()
-
-if(ENABLE_FARSIGHT)
-    # Find tp-farsight
-    set(TELEPATHY_FARSIGHT_MIN_VERSION "0.0.4")
-    find_package(TelepathyFarsight)
-    macro_log_feature(TELEPATHYFARSIGHT_FOUND "Telepathy-Farsight"
-                      "A Framework for dealing with audio/video conferencing protocols"
-                      "http://farsight.freedesktop.org/wiki/" FALSE "${TELEPATHY_FARSIGHT_MIN_VERSION}"
-                      "Needed, together with GStreamer, to build telepathy-qt-farsight and some additional examples")
-endif()
-
-if(ENABLE_FARSTREAM)
-    # Find tp-farstream
-    set(FARSTREAM_MIN_VERSION "0.1.0")
-    find_package(Farstream)
-    macro_log_feature(FARSTREAM_FOUND "Farstream"
-                      "A Framework for dealing with audio/video conferencing protocols"
-                      "http://www.freedesktop.org/wiki/Software/Farstream" FALSE "${FARSTREAM_MIN_VERSION}"
-                      "Needed, together with GStreamer and Telepathy-Farstream, to build telepathy-qt-farstream")
-
-    # Find tp-farstream
-    set(TELEPATHY_FARSTREAM_MIN_VERSION "0.2.2")
-    find_package(TelepathyFarstream)
-    macro_log_feature(TELEPATHYFARSTREAM_FOUND "Telepathy-Farstream"
-                      "A Framework for dealing with audio/video conferencing protocols"
-                      "http://telepathy.freedesktop.org/wiki/" FALSE "${TELEPATHY_FARSTREAM_MIN_VERSION}"
-                      "Needed, together with GStreamer and Farstream, to build telepathy-qt-farstream")
-endif()
-
-if(ENABLE_FARSTREAM OR ENABLE_FARSIGHT)
-    # Find GStreamer
-    find_package(GStreamer)
-    macro_log_feature(GSTREAMER_FOUND "GStreamer"
-                      "An open source multimedia framework"
-                      "Needed, together with Tp-Farsight, to build telepathy-qt-farsight and some additional examples"
-                      "http://www.gstreamer.net/" FALSE)
-endif()
-
-# Build TelepathyQt-Farsight only if GStreamer, TelepathyFarsight and all of their dependencies were found
-if (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND AND TELEPATHYGLIB_FOUND AND ENABLE_FARSIGHT)
-    set (FARSIGHT_COMPONENTS_FOUND 1)
-else (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND AND TELEPATHYGLIB_FOUND AND ENABLE_FARSIGHT)
-    set (FARSIGHT_COMPONENTS_FOUND 0)
-endif (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND AND TELEPATHYGLIB_FOUND AND ENABLE_FARSIGHT)
-
-# Build TelepathyQt-Farstream only if GStreamer, TelepathyFarstream and all of their dependencies were found
-if (TELEPATHYFARSTREAM_FOUND AND FARSTREAM_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND AND TELEPATHYGLIB_FOUND AND ENABLE_FARSTREAM)
-    set (FARSTREAM_COMPONENTS_FOUND 1)
-else (TELEPATHYFARSTREAM_FOUND AND FARSTREAM_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND AND TELEPATHYGLIB_FOUND AND ENABLE_FARSTREAM)
-    set (FARSTREAM_COMPONENTS_FOUND 0)
-endif (TELEPATHYFARSTREAM_FOUND AND FARSTREAM_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND AND TELEPATHYGLIB_FOUND AND ENABLE_FARSTREAM)
-
-if (ENABLE_TESTS)
-    # Enable glib-based tests only if Qt has GLib support and Telepathy-glib was found
-    if(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
-        # Disable GLib deprecation warnings for now; GValueArray is deprecated but we
-        # need it for telepathy-glib.
-        add_definitions(-DGLIB_DISABLE_DEPRECATION_WARNINGS)
-        set(ENABLE_TP_GLIB_TESTS 1)
-        if(GIO_FOUND AND GIOUNIX_FOUND)
-            set(ENABLE_TP_GLIB_GIO_TESTS 1)
-        else(GIO_FOUND AND GIOUNIX_FOUND)
-            set(ENABLE_TP_GLIB_GIO_TESTS 0)
-        endif(GIO_FOUND AND GIOUNIX_FOUND)
-    else(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
-        set(ENABLE_TP_GLIB_TESTS 0)
-        set(ENABLE_TP_GLIB_GIO_TESTS 0)
-    endif(QT_GLIB_SUPPORT AND TELEPATHYGLIB_FOUND AND GLIB2_FOUND AND DBUS_FOUND)
-endif(ENABLE_TESTS)
-
-# Add the source subdirectories
-add_subdirectory(TelepathyQt)
-if(ENABLE_EXAMPLES)
-    add_subdirectory(examples)
-endif()
-if(ENABLE_TESTS)
-    add_subdirectory(tests)
-endif()
-add_subdirectory(tools)
-
-# Generate config.h and config-version.h
-configure_file(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_BINARY_DIR}/config.h)
-configure_file(${CMAKE_SOURCE_DIR}/config-version.h.in ${CMAKE_BINARY_DIR}/config-version.h)
-
-# Create the uninstall target
-configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
-    IMMEDIATE @ONLY)
-
-add_custom_target(uninstall
-    "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
-
-# Display the feature log
-macro_display_feature_log()
-
-# Always keep it last: CPack definitions file
-include(TelepathyDist)
 
=== removed directory '.pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt'
=== removed file '.pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/CMakeLists.txt'
--- .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/CMakeLists.txt	2013-06-06 04:56:14 +0000
+++ .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,1007 +0,0 @@
-file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/_gen")
-
-# Set the required flags found in TelepathyDefaults
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${VISIBILITY_HIDDEN_FLAGS} ${COMPILER_COVERAGE_FLAGS} ${DEPRECATED_DECLARATIONS_FLAGS}")
-set(LD_FLAGS "${LD_FLAGS} ${VISIBILITY_HIDDEN_FLAGS} ${COMPILER_COVERAGE_FLAGS} ${DEPRECATED_DECLARATIONS_FLAGS}")
-
-# We are building Telepathy-Qt
-add_definitions(-DBUILDING_TP_QT)
-
-# Sources for Tp-Qt
-set(telepathy_qt_SRCS
-    abstract-client.cpp
-    abstract-interface.cpp
-    account.cpp
-    account-factory.cpp
-    account-manager.cpp
-    account-property-filter.cpp
-    account-set.cpp
-    account-set-internal.h
-    avatar.cpp
-    call-channel.cpp
-    call-content.cpp
-    call-stream.cpp
-    capabilities-base.cpp
-    call-content.cpp
-    call-content-media-description.cpp
-    call-stream.cpp
-    call-stream-endpoint.cpp
-    captcha.cpp
-    captcha-authentication.cpp
-    channel.cpp
-    channel-class-spec.cpp
-    channel-dispatcher.cpp
-    channel-dispatch-operation.cpp
-    channel-factory.cpp
-    channel-internal.h
-    channel-request.cpp
-    client.cpp
-    client-registrar.cpp
-    client-registrar-internal.h
-    connection.cpp
-    connection-capabilities.cpp
-    connection-factory.cpp
-    connection-internal.h
-    connection-manager.cpp
-    connection-manager-internal.h
-    contact.cpp
-    contact-capabilities.cpp
-    contact-factory.cpp
-    contact-manager.cpp
-    contact-manager-roster.cpp
-    contact-messenger.cpp
-    contact-search-channel.cpp
-    dbus.cpp
-    dbus-proxy.cpp
-    dbus-proxy-factory.cpp
-    dbus-proxy-factory-internal.h
-    dbus-tube-channel.cpp
-    debug.cpp
-    debug-receiver.cpp
-    debug-internal.h
-    fake-handler-manager-internal.cpp
-    fake-handler-manager-internal.h
-    feature.cpp
-    file-transfer-channel.cpp
-    file-transfer-channel-creation-properties.cpp
-    fixed-feature-factory.cpp
-    future.cpp
-    future-internal.h
-    handled-channel-notifier.cpp
-    incoming-dbus-tube-channel.cpp
-    incoming-file-transfer-channel.cpp
-    incoming-stream-tube-channel.cpp
-    key-file.cpp
-    key-file.h
-    location-info.cpp
-    manager-file.cpp
-    manager-file.h
-    media-session-handler.cpp
-    media-stream-handler.cpp
-    message.cpp
-    message-content-part.cpp
-    object.cpp
-    optional-interface-factory.cpp
-    outgoing-dbus-tube-channel.cpp
-    outgoing-file-transfer-channel.cpp
-    outgoing-stream-tube-channel.cpp
-    pending-account.cpp
-    pending-captchas.cpp
-    pending-channel.cpp
-    pending-channel-request.cpp
-    pending-channel-request-internal.h
-    pending-connection.cpp
-    pending-contact-attributes.cpp
-    pending-contact-info.cpp
-    pending-contacts.cpp
-    pending-dbus-tube-connection.cpp
-    pending-debug-message-list.cpp
-    pending-handles.cpp
-    pending-operation.cpp
-    pending-ready.cpp
-    pending-send-message.cpp
-    pending-string.cpp
-    pending-string-list.cpp
-    pending-stream-tube-connection.cpp
-    pending-variant.cpp
-    presence.cpp
-    pending-variant-map.cpp
-    profile.cpp
-    profile-manager.cpp
-    properties.cpp
-    protocol-info.cpp
-    protocol-parameter.cpp
-    readiness-helper.cpp
-    requestable-channel-class-spec.cpp
-    ready-object.cpp
-    referenced-handles.cpp
-    request-temporary-handler-internal.cpp
-    request-temporary-handler-internal.h
-    room-list-channel.cpp
-    server-authentication-channel.cpp
-    simple-call-observer.cpp
-    simple-observer.cpp
-    simple-observer-internal.h
-    simple-stream-tube-handler.cpp
-    simple-text-observer.cpp
-    simple-text-observer-internal.h
-    stream-tube-channel.cpp
-    stream-tube-client.cpp
-    stream-tube-client-internal.h
-    stream-tube-server.cpp
-    stream-tube-server-internal.h
-    streamed-media-channel.cpp
-    text-channel.cpp
-    tls-certificate.cpp
-    tube-channel.cpp
-    types.cpp
-    types-internal.h
-    utils.cpp)
-
-# Exported headers for Tp-Qt
-set(telepathy_qt_HEADERS
-    AbstractClient
-    AbstractClientApprover
-    abstract-client.h
-    AbstractClientHandler
-    AbstractClientObserver
-    AbstractInterface
-    abstract-interface.h
-    Account
-    account.h
-    AccountCapabilityFilter
-    account-capability-filter.h
-    AccountFactory
-    account-factory.h
-    AccountFilter
-    account-filter.h
-    AccountInterface
-    AccountInterfaceAddressingInterface
-    AccountInterfaceAvatarInterface
-    AccountInterfaceStorageInterface
-    AccountManager
-    account-manager.h
-    AccountManagerInterface
-    account-property-filter.h
-    AccountPropertyFilter
-    AccountSet
-    account-set.h
-    AndFilter
-    and-filter.h
-    AuthenticationTLSCertificateInterface
-    AvatarData
-    AvatarSpec
-    avatar.h
-    CallChannel
-    call-channel.h
-    Callbacks
-    callbacks.h
-    CallContent
-    CallContentInterface
-    CallContentInterfaceAudioControlInterface
-    CallContentInterfaceDTMFInterface
-    CallContentInterfaceMediaInterface
-    CallContentInterfaceVideoControlInterface
-    call-content.h
-    CallContentMediaDescription
-    CallContentMediaDescriptionInterface
-    CallContentMediaDescriptionInterfaceRTCPExtendedReportsInterface
-    CallContentMediaDescriptionInterfaceRTCPFeedbackInterface
-    CallContentMediaDescriptionInterfaceRTPHeaderExtensionsInterface
-    call-content-media-description.h
-    CallStream
-    CallStreamInterface
-    CallStreamInterfaceMediaInterface
-    call-stream.h
-    CallStreamEndpoint
-    CallStreamEndpoint
-    CallStreamEndpointInterface
-    call-stream-endpoint.h
-    CapabilitiesBase
-    capabilities-base.h
-    Captcha
-    captcha.h
-    CaptchaAuthentication
-    captcha-authentication.h
-    Channel
-    channel.h
-    ChannelClassFeatures
-    channel-class-features.h
-    ChannelClassSpec
-    ChannelClassSpecList
-    channel-class-spec.h
-    ChannelDispatcher
-    ChannelDispatcherInterface
-    channel-dispatcher.h
-    ChannelDispatchOperation
-    channel-dispatch-operation.h
-    ChannelDispatchOperationInterface
-    ChannelFactory
-    channel-factory.h
-    ChannelInterface
-    ChannelInterfaceAnonymityInterface
-    ChannelInterfaceCaptchaAuthenticationInterface
-    ChannelInterfaceCallStateInterface
-    ChannelInterfaceChatStateInterface
-    ChannelInterfaceConferenceInterface
-    ChannelInterfaceDestroyableInterface
-    ChannelInterfaceDTMFInterface
-    ChannelInterfaceFileTransferMetadataInterface
-    ChannelInterfaceGroupInterface
-    ChannelInterfaceHoldInterface
-    ChannelInterfaceMediaSignallingInterface
-    ChannelInterfaceMessagesInterface
-    ChannelInterfacePasswordInterface
-    ChannelInterfaceSASLAuthenticationInterface
-    ChannelInterfaceSecurableInterface
-    ChannelInterfaceServicePointInterface
-    ChannelInterfaceSMSInterface
-    ChannelInterfaceTubeInterface
-    ChannelRequest
-    ChannelRequestHints
-    channel-request.h
-    ChannelRequestInterface
-    ChannelTypeCallInterface
-    ChannelTypeContactListInterface
-    ChannelTypeContactSearchInterface
-    ChannelTypeDBusTubeInterface
-    ChannelTypeFileTransferInterface
-    ChannelTypeRoomListInterface
-    ChannelTypeServerAuthenticationInterface
-    ChannelTypeServerTLSConnectionInterface
-    ChannelTypeStreamedMediaInterface
-    ChannelTypeStreamTubeInterface
-    ChannelTypeTextInterface
-    ChannelTypeTubeInterface
-    ChannelTypeTubesInterface
-    Client
-    ClientApproverInterface
-    client.h
-    ClientHandlerInterface
-    ClientInterface
-    ClientInterfaceRequestsInterface
-    ClientObserverInterface
-    ClientRegistrar
-    client-registrar.h
-    Connection
-    ConnectionCapabilities
-    connection-capabilities.h
-    connection.h
-    ConnectionFactory
-    connection-factory.h
-    connection-lowlevel.h
-    ConnectionInterface
-    ConnectionInterfaceAddressingInterface
-    ConnectionInterfaceAliasingInterface
-    ConnectionInterfaceAnonymityInterface
-    ConnectionInterfaceAvatarsInterface
-    ConnectionInterfaceBalanceInterface
-    ConnectionInterfaceCapabilitiesInterface
-    ConnectionInterfaceCellularInterface
-    ConnectionInterfaceContactBlockingInterface
-    ConnectionInterfaceClientTypesInterface
-    ConnectionInterfaceContactCapabilitiesInterface
-    ConnectionInterfaceContactGroupsInterface
-    ConnectionInterfaceContactInfoInterface
-    ConnectionInterfaceContactListInterface
-    ConnectionInterfaceContactsInterface
-    ConnectionInterfaceLocationInterface
-    ConnectionInterfaceMailNotificationInterface
-    ConnectionInterfacePowerSavingInterface
-    ConnectionInterfacePresenceInterface
-    ConnectionInterfaceRequestsInterface
-    ConnectionInterfaceServicePointInterface
-    ConnectionInterfaceSimplePresenceInterface
-    ConnectionLowlevel
-    ConnectionManager
-    connection-manager.h
-    connection-manager-lowlevel.h
-    ConnectionManagerInterface
-    ConnectionManagerLowlevel
-    Constants
-    constants.h
-    Contact
-    contact.h
-    ContactCapabilities
-    contact-capabilities.h
-    ContactFactory
-    contact-factory.h
-    ContactManager
-    contact-manager.h
-    ContactMessenger
-    contact-messenger.h
-    ContactSearchChannel
-    contact-search-channel.h
-    DBus
-    DBusDaemonInterface
-    dbus.h
-    DBusProxy
-    dbus-proxy.h
-    DBusProxyFactory
-    dbus-proxy-factory.h
-    DBusTubeChannel
-    dbus-tube-channel.h
-    Debug
-    debug.h
-    DebugReceiver
-    debug-receiver.h
-    Feature
-    Features
-    feature.h
-    FileTransferChannel
-    FileTransferChannelCreationProperties
-    file-transfer-channel-creation-properties.h
-    file-transfer-channel.h
-    Filter
-    filter.h
-    FixedFeatureFactory
-    fixed-feature-factory.h
-    Functors
-    functors.h
-    GenericCapabilityFilter
-    generic-capability-filter.h
-    GenericPropertyFilter
-    generic-property-filter.h
-    Global
-    global.h
-    HandledChannelNotifier
-    handled-channel-notifier.h
-    IncomingDBusTubeChannel
-    incoming-dbus-tube-channel.h
-    IncomingFileTransferChannel
-    incoming-file-transfer-channel.h
-    IncomingStreamTubeChannel
-    incoming-stream-tube-channel.h
-    IntrospectableInterface
-    LocationInfo
-    location-info.h
-    MediaSessionHandler
-    media-session-handler.h
-    MediaSessionHandlerInterface
-    MediaStreamHandler
-    media-stream-handler.h
-    MediaStreamHandlerInterface
-    Message
-    message.h
-    MessageContentPart
-    MessageContentPartList
-    message-content-part.h
-    MethodInvocationContext
-    method-invocation-context.h
-    NotFilter
-    not-filter.h
-    Object
-    object.h
-    OptionalInterfaceFactory
-    optional-interface-factory.h
-    OrFilter
-    or-filter.h
-    OutgoingDBusTubeChannel
-    outgoing-dbus-tube-channel.h
-    OutgoingFileTransferChannel
-    outgoing-file-transfer-channel.h
-    OutgoingStreamTubeChannel
-    outgoing-stream-tube-channel.h
-    PeerInterface
-    PendingAccount
-    pending-account.h
-    PendingCallContent
-    PendingCaptchas
-    pending-captchas.h
-    PendingChannel
-    pending-channel.h
-    PendingChannelRequest
-    pending-channel-request.h
-    PendingComposite
-    PendingConnection
-    pending-connection.h
-    PendingContactAttributes
-    pending-contact-attributes.h
-    PendingContactInfo
-    pending-contact-info.h
-    PendingContacts
-    pending-contacts.h
-    PendingDBusTubeConnection
-    pending-dbus-tube-connection.h
-    PendingDebugMessageList
-    pending-debug-message-list.h
-    PendingFailure
-    PendingHandles
-    pending-handles.h
-    PendingOperation
-    pending-operation.h
-    PendingReady
-    pending-ready.h
-    PendingSendMessage
-    pending-send-message.h
-    PendingStreamedMediaStreams
-    PendingStreamTubeConnection
-    pending-stream-tube-connection.h
-    PendingString
-    pending-string.h
-    PendingStringList
-    pending-string-list.h
-    PendingSuccess
-    PendingVariant
-    pending-variant.h
-    PendingVariantMap
-    pending-variant-map.h
-    PendingVoid
-    Presence
-    presence.h
-    PresenceSpec
-    PresenceSpecList
-    Profile
-    profile.h
-    ProfileManager
-    profile-manager.h
-    Properties
-    properties.h
-    PropertiesInterface
-    PropertiesInterfaceInterface
-    ProtocolInfo
-    ProtocolInfoList
-    protocol-info.h
-    ProtocolInterface
-    ProtocolInterfaceAddressingInterface
-    ProtocolInterfaceAvatarsInterface
-    ProtocolInterfacePresenceInterface
-    ProtocolParameter
-    ProtocolParameterList
-    protocol-parameter.h
-    ReadinessHelper
-    readiness-helper.h
-    ReadyObject
-    ready-object.h
-    ReceivedMessage
-    RefCounted
-    ReferencedHandles
-    referenced-handles.h
-    ReferencedHandlesIterator
-    requestable-channel-class-spec.h
-    RequestableChannelClassSpec
-    RequestableChannelClassSpecList
-    RoomListChannel
-    room-list-channel.h
-    ServerAuthenticationChannel
-    server-authentication-channel.h
-    SharedPtr
-    shared-ptr.h
-    SimpleCallObserver
-    simple-call-observer.h
-    SimpleObserver
-    simple-observer.h
-    simple-pending-operations.h
-    SimpleTextObserver
-    simple-text-observer.h
-    StatefulDBusProxy
-    StatelessDBusProxy
-    StreamTubeChannel
-    StreamTubeClient
-    StreamTubeServer
-    stream-tube-channel.h
-    stream-tube-client.h
-    stream-tube-server.h
-    StreamedMediaChannel
-    streamed-media-channel.h
-    StreamedMediaStream
-    TextChannel
-    text-channel.h
-    tls-certificate.h
-    TubeChannel
-    tube-channel.h
-    Types
-    types.h
-    Utils
-    utils.h
-    SharedPtr)
-
-# Generated headers which will be installed and exported
-set(telepathy_qt_gen_HEADERS
-    ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-account.h
-    ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-account-manager.h
-    ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-call-content.h
-    ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-call-content-media-description.h
-    ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-call-stream.h
-    ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-call-stream-endpoint.h
-    ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-channel.h
-    ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-channel-dispatcher.h
-    ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-channel-dispatch-operation.h
-    ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-channel-request.h
-    ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-client.h
-    ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-connection.h
-    ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-connection-manager.h
-    ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-dbus.h
-    ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-debug-receiver.h
-    ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-media-session-handler.h
-    ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-media-stream-handler.h
-    ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-properties.h
-    ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-tls-certificate.h
-    ${CMAKE_CURRENT_BINARY_DIR}/_gen/constants.h
-    ${CMAKE_CURRENT_BINARY_DIR}/_gen/types.h)
-
-# Headers file moc will be run on
-set(telepathy_qt_MOC_SRCS
-    abstract-interface.h
-    account.h
-    account-factory.h
-    account-manager.h
-    account-set.h
-    account-set-internal.h
-    call-channel.h
-    call-content.h
-    call-stream.h
-    captcha-authentication.h
-    captcha-authentication-internal.h
-    channel.h
-    channel-dispatch-operation.h
-    channel-dispatch-operation-internal.h
-    channel-factory.h
-    channel-internal.h
-    channel-request.h
-    client-registrar.h
-    client-registrar-internal.h
-    connection.h
-    connection-internal.h
-    connection-lowlevel.h
-    connection-manager.h
-    connection-manager-internal.h
-    connection-manager-lowlevel.h
-    contact.h
-    contact-manager.h
-    contact-manager-internal.h
-    contact-messenger.h
-    contact-search-channel.h
-    contact-search-channel-internal.h
-    dbus-proxy.h
-    dbus-proxy-factory.h
-    dbus-proxy-factory-internal.h
-    debug-receiver.h
-    dbus-tube-channel.h
-    fake-handler-manager-internal.h
-    file-transfer-channel.h
-    fixed-feature-factory.h
-    handled-channel-notifier.h
-    incoming-dbus-tube-channel.h
-    incoming-file-transfer-channel.h
-    incoming-stream-tube-channel.h
-    object.h
-    outgoing-dbus-tube-channel.h
-    outgoing-file-transfer-channel.h
-    outgoing-stream-tube-channel.h
-    outgoing-stream-tube-channel-internal.h
-    pending-account.h
-    pending-captchas.h
-    pending-channel.h
-    pending-channel-request.h
-    pending-channel-request-internal.h
-    pending-connection.h
-    pending-contact-attributes.h
-    pending-contact-info.h
-    pending-contacts.h
-    pending-contacts-internal.h
-    pending-dbus-tube-connection.h
-    pending-debug-message-list.h
-    pending-handles.h
-    pending-operation.h
-    pending-ready.h
-    pending-send-message.h
-    pending-stream-tube-connection.h
-    pending-string.h
-    pending-string-list.h
-    pending-variant.h
-    pending-variant-map.h
-    profile-manager.h
-    readiness-helper.h
-    request-temporary-handler-internal.h
-    room-list-channel.h
-    server-authentication-channel.h
-    simple-call-observer.h
-    simple-pending-operations.h
-    simple-observer.h
-    simple-observer-internal.h
-    simple-stream-tube-handler.h
-    simple-text-observer.h
-    simple-text-observer-internal.h
-    stream-tube-channel.h
-    stream-tube-client.h
-    stream-tube-client-internal.h
-    stream-tube-server.h
-    stream-tube-server-internal.h
-    streamed-media-channel.h
-    text-channel.h
-    tube-channel.h)
-
-# Sources for test library, used by tests to test some unexported functionality
-set(telepathy_qt_test_backdoors_SRCS
-    key-file.cpp
-    manager-file.cpp
-    test-backdoors.cpp
-    utils.cpp)
-
-# Generate the spec files for both stable and future spec
-set(gen_stable_spec_xml ${CMAKE_CURRENT_BINARY_DIR}/_gen/stable-spec.xml)
-set(gen_future_spec_xml ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-spec.xml)
-
-tpqt_xincludator(stable-ifaces-includator ${CMAKE_CURRENT_SOURCE_DIR}/stable-interfaces.xml ${gen_stable_spec_xml})
-tpqt_xincludator(future-ifaces-includator ${CMAKE_CURRENT_SOURCE_DIR}/future-interfaces.xml ${gen_future_spec_xml})
-
-add_custom_target(all-generated-sources)
-
-tpqt_constants_gen(stable-constants ${gen_stable_spec_xml} ${CMAKE_CURRENT_BINARY_DIR}/_gen/constants.h
-                    --namespace=Tp
-                    --define-prefix=TP_QT_
-                    --must-define=IN_TP_QT_HEADER
-                    DEPENDS stable-ifaces-includator)
-tpqt_constants_gen(future-constants ${gen_future_spec_xml} ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-constants.h
-                    --namespace=TpFuture
-                    --define-prefix=TP_QT_FUTURE_
-                    DEPENDS future-ifaces-includator)
-
-tpqt_types_gen(stable-typesgen ${gen_stable_spec_xml}
-                ${CMAKE_CURRENT_BINARY_DIR}/_gen/types.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/types-body.hpp
-                Tp TelepathyQt/types.h TelepathyQt/Types
-                --must-define=IN_TP_QT_HEADER
-                --visibility=TP_QT_EXPORT
-                DEPENDS stable-constants)
-tpqt_types_gen(future-typesgen ${gen_future_spec_xml}
-                ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-types.h ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-types-body.hpp
-                TpFuture TelepathyQt/future-internal.h TelepathyQt/future-internal.h
-                DEPENDS future-constants)
-
-# Add the generated types to the library's sources
-list(APPEND telepathy_qt_SRCS ${CMAKE_CURRENT_BINARY_DIR}/_gen/types.h)
-list(APPEND telepathy_qt_SRCS ${CMAKE_CURRENT_BINARY_DIR}/_gen/types-body.hpp)
-list(APPEND telepathy_qt_SRCS ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-constants.h)
-list(APPEND telepathy_qt_SRCS ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-types.h)
-list(APPEND telepathy_qt_SRCS ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-types-body.hpp)
-
-# For each spec, both stable and future, generate a cli file and add it to the sources (including mocs).
-set(SPECS
-    account
-    account-manager
-    call-content
-    call-content-media-description
-    call-stream
-    call-stream-endpoint
-    channel
-    channel-dispatcher
-    channel-dispatch-operation
-    channel-request
-    client
-    connection
-    connection-manager
-    dbus
-    debug-receiver
-    media-session-handler
-    media-stream-handler
-    properties
-    tls-certificate)
-foreach(spec ${SPECS})
-    tpqt_xincludator(${spec}-spec-xincludator ${CMAKE_CURRENT_SOURCE_DIR}/${spec}.xml ${CMAKE_CURRENT_BINARY_DIR}/_gen/spec-${spec}.xml
-                      DEPENDS stable-typesgen)
-    set(NEW_FILES
-        ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}-body.hpp
-        ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.moc.hpp)
-    list(APPEND telepathy_qt_SRCS ${NEW_FILES})
-    list(APPEND telepathy_qt_generated_specs_mocs "moc-cli-${spec}.moc.hpp")
-    set_source_files_properties(${NEW_FILES} PROPERTIES GENERATED true)
-endforeach(spec ${SPECS})
-
-set(FUTURE_SPECS
-    channel
-    channel-dispatcher
-    misc)
-foreach(spec ${FUTURE_SPECS})
-    tpqt_xincludator(${spec}-future-xincludator  ${CMAKE_CURRENT_SOURCE_DIR}/future-${spec}.xml ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.xml
-                      DEPENDS stable-typesgen future-typesgen)
-    set(NEW_FILES
-        ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.h
-        ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}-body.hpp
-        ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.moc.hpp)
-    list(APPEND telepathy_qt_SRCS ${NEW_FILES})
-    list(APPEND telepathy_qt_generated_specs_mocs "moc-future-${spec}.moc.hpp")
-    set_source_files_properties(${NEW_FILES} PROPERTIES GENERATED true)
-endforeach(spec ${FUTURE_SPECS})
-
-# The escape character in MSVC is ^
-if(MSVC)
-    set(TYPES_INCLUDE ^<TelepathyQt/Types^> )
-else(MSVC)
-    set(TYPES_INCLUDE '<TelepathyQt/Types>' )
-endif(MSVC)
-
-# Use the client generator for generating headers out of specs
-tpqt_client_generator(account clientaccount AccountManager Tp::Client --mainiface=Tp::Client::AccountInterface DEPENDS account-spec-xincludator)
-tpqt_client_generator(account-manager clientam AccountManager Tp::Client --mainiface=Tp::Client::AccountManagerInterface DEPENDS account-manager-spec-xincludator)
-tpqt_client_generator(call-content clientcall CallContent Tp::Client --mainiface=Tp::Client::CallContentInterface DEPENDS call-content-spec-xincludator)
-tpqt_client_generator(call-content-media-description clientcall CallContentMediaDescriptionInterface Tp::Client --mainiface=Tp::Client::CallContentMediaDescriptionInterface DEPENDS call-content-media-description-spec-xincludator)
-tpqt_client_generator(call-stream clientcall CallStream Tp::Client --mainiface=Tp::Client::CallStreamInterface DEPENDS call-stream-spec-xincludator)
-tpqt_client_generator(call-stream-endpoint clientcall CallStreamEndpoint Tp::Client --mainiface=Tp::Client::CallStreamEndpointInterface DEPENDS call-stream-endpoint-spec-xincludator)
-tpqt_client_generator(channel clientchannel Channel Tp::Client --mainiface=Tp::Client::ChannelInterface DEPENDS channel-spec-xincludator)
-tpqt_client_generator(channel-dispatcher clientchanneldispatcher ChannelDispatcher Tp::Client --mainiface=Tp::Client::ChannelDispatcherInterface DEPENDS channel-dispatcher-spec-xincludator)
-tpqt_client_generator(channel-dispatch-operation clientchanneldispatchoperation ChannelDispatchOperation Tp::Client --mainiface=Tp::Client::ChannelDispatchOperationInterface DEPENDS channel-dispatch-operation-spec-xincludator)
-tpqt_client_generator(channel-request clientchannelrequest ChannelRequest Tp::Client --mainiface=Tp::Client::ChannelRequestInterface DEPENDS channel-request-spec-xincludator)
-tpqt_client_generator(client clientclient Client Tp::Client --mainiface=Tp::Client::ClientInterface DEPENDS client-spec-xincludator)
-tpqt_client_generator(connection clientconn Connection Tp::Client --mainiface=Tp::Client::ConnectionInterface DEPENDS connection-spec-xincludator)
-tpqt_client_generator(connection-manager clientcm ConnectionManager Tp::Client --mainiface=Tp::Client::ConnectionManagerInterface DEPENDS connection-manager-spec-xincludator)
-tpqt_client_generator(dbus clientdbus DBus Tp::Client::DBus DEPENDS dbus-spec-xincludator)
-tpqt_client_generator(debug-receiver clientdebug DebugReceiver Tp::Client --mainiface=Tp::Client::DebugInterface DEPENDS debug-receiver-spec-xincludator)
-tpqt_client_generator(media-session-handler clientmsesh MediaSessionHandler Tp::Client --mainiface=Tp::Client::MediaSessionHandlerInterface DEPENDS media-session-handler-spec-xincludator)
-tpqt_client_generator(media-stream-handler clientmstrh MediaStreamHandler Tp::Client --mainiface=Tp::Client::MediaStreamHandlerInterface DEPENDS media-stream-handler-spec-xincludator)
-tpqt_client_generator(properties clientprops Properties Tp::Client DEPENDS properties-spec-xincludator)
-tpqt_client_generator(tls-certificate clienttls TLSCertificate Tp::Client DEPENDS tls-certificate-spec-xincludator)
-
-tpqt_future_client_generator(channel TpFuture::Client --mainiface=Tp::Client::ChannelInterface DEPENDS channel-future-xincludator)
-tpqt_future_client_generator(channel-dispatcher TpFuture::Client --mainiface=Tp::Client::ChannelDispatcherInterface DEPENDS channel-dispatcher-future-xincludator)
-tpqt_future_client_generator(misc TpFuture::Client DEPENDS misc-future-xincludator)
-
-if (TARGET doxygen-doc)
-    add_dependencies(doxygen-doc all-generated-sources)
-endif (TARGET doxygen-doc)
-
-# Create the library
-if (ENABLE_COMPILER_COVERAGE)
-    add_library(telepathy-qt${QT_VERSION_MAJOR} STATIC ${telepathy_qt_SRCS})
-else (ENABLE_COMPILER_COVERAGE)
-    add_library(telepathy-qt${QT_VERSION_MAJOR} SHARED ${telepathy_qt_SRCS})
-endif (ENABLE_COMPILER_COVERAGE)
-
-# Library used by tests to test some unexported functionality
-add_library(telepathy-qt-test-backdoors STATIC ${telepathy_qt_test_backdoors_SRCS})
-add_dependencies(telepathy-qt-test-backdoors stable-constants)
-add_dependencies(telepathy-qt-test-backdoors stable-typesgen)
-
-# generate client moc files
-foreach(moc_src ${telepathy_qt_MOC_SRCS})
-    set(generated_file _gen/${moc_src})
-    string(REPLACE ".h" ".moc.hpp" generated_file ${generated_file})
-    tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_SOURCE_DIR}/${moc_src} ${CMAKE_CURRENT_BINARY_DIR}/${generated_file}
-                                     ${telepathy_qt_generated_specs_mocs})
-    list(APPEND telepathy_qt_SRCS ${CMAKE_CURRENT_BINARY_DIR}/${generated_file})
-    string(REPLACE ".h" ".moc.hpp" moc_src ${moc_src})
-    add_dependencies(telepathy-qt${QT_VERSION_MAJOR} "moc-${moc_src}")
-endforeach(moc_src ${telepathy_qt_MOC_SRCS})
-
-# Link
-target_link_libraries(telepathy-qt${QT_VERSION_MAJOR}
-    ${QT_QTCORE_LIBRARY}
-    ${QT_QTDBUS_LIBRARY}
-    ${QT_QTNETWORK_LIBRARY}
-    ${QT_QTXML_LIBRARY}
-    ${TP_QT_LIBRARY_LINKER_FLAGS})
-
-# Link - Library used by tests to test some unexported functionality
-target_link_libraries(telepathy-qt-test-backdoors
-    ${QT_QTCORE_LIBRARY}
-    ${QT_QTDBUS_LIBRARY}
-    ${QT_QTNETWORK_LIBRARY}
-    ${QT_QTXML_LIBRARY}
-    ${TP_QT_LIBRARY_LINKER_FLAGS})
-
-if (ENABLE_COMPILER_COVERAGE)
-    target_link_libraries(telepathy-qt${QT_VERSION_MAJOR} gcov)
-    target_link_libraries(telepathy-qt-test-backdoors gcov)
-endif (ENABLE_COMPILER_COVERAGE)
-
-# Set the correct version number
-set_target_properties(telepathy-qt${QT_VERSION_MAJOR} PROPERTIES
-                                    SOVERSION ${TP_QT_ABI_VERSION}
-                                    VERSION ${TP_QT_LIBRARY_VERSION})
-
-
-# Install header files
-install(FILES ${telepathy_qt_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}/TelepathyQt COMPONENT headers)
-install(FILES ${telepathy_qt_gen_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}/TelepathyQt/_gen COMPONENT headers)
-
-# Install the library - watch out for the correct components
-if (WIN32)
-    install(TARGETS telepathy-qt${QT_VERSION_MAJOR}
-            EXPORT  TelepathyQt${QT_VERSION_MAJOR}Targets
-            RUNTIME DESTINATION ${LIB_INSTALL_DIR} COMPONENT mainlibrary
-            ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT libs)
-else (WIN32)
-    install(TARGETS telepathy-qt${QT_VERSION_MAJOR}
-            EXPORT  TelepathyQt${QT_VERSION_MAJOR}Targets
-            LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT mainlibrary
-            ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT libs)
-endif (WIN32)
-
-# pkg-config files, only if we are not using windows
-if (NOT WIN32)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TelepathyQt.pc.in ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}.pc)
-    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TelepathyQt-uninstalled.pc.in ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}-uninstalled.pc)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig COMPONENT pkgconfig)
-endif (NOT WIN32)
-
-# CMake Version and config files
-include(MacroWriteBasicCMakeVersionFile)
-
-# all the following variables are put into TelepathyQt*Config.cmake, so
-# they are usable by projects using TelepathyQt.
-make_install_path_absolute(TELEPATHY_QT_INCLUDE_DIR         ${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR})
-make_install_path_absolute(TELEPATHY_QT_LIB_DIR             ${LIB_INSTALL_DIR})
-make_install_path_absolute(TELEPATHY_QT_DATA_DIR            ${DATA_INSTALL_DIR})
-
-# Configure the actual Config file
-configure_file(TelepathyQtConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}Config.cmake" @ONLY)
-
-# this file is used by to check if the installed version can be used.
-macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}ConfigVersion.cmake
-                                     ${PACKAGE_VERSION})
-
-# Find out the correct installation directory
-if (USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
-    set(_TelepathyQtConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/TelepathyQt${QT_VERSION_MAJOR})
-else (USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
-    set(_TelepathyQtConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/TelepathyQt${QT_VERSION_MAJOR}/cmake)
-endif (USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
-
-install(EXPORT TelepathyQt${QT_VERSION_MAJOR}Targets
-        DESTINATION ${_TelepathyQtConfig_INSTALL_DIR}
-        COMPONENT headers)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}ConfigVersion.cmake
-              ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}Config.cmake
-        DESTINATION ${_TelepathyQtConfig_INSTALL_DIR}
-        COMPONENT headers)
-
-add_subdirectory(Farsight)
-add_subdirectory(Farstream)
-
-if(ENABLE_EXPERIMENTAL_SERVICE_SUPPORT)
-    # lets build tp-qt service side support as a separate library until we can guarantee API/ABI
-    # stability
-    set(telepathy_qt_service_SRCS
-        base-connection-manager.cpp
-        base-connection.cpp
-        base-protocol.cpp
-        dbus-error.cpp
-        dbus-object.cpp
-        dbus-service.cpp
-        abstract-adaptor.cpp)
-
-    set(telepathy_qt_service_HEADERS
-        AbstractAdaptor
-        abstract-adaptor.h
-        AbstractDBusServiceInterface
-        AbstractProtocolInterface
-        BaseConnectionManager
-        base-connection-manager.h
-        BaseConnection
-        base-connection.h
-        BaseProtocol
-        BaseProtocolAddressingInterface
-        BaseProtocolAvatarsInterface
-        BaseProtocolPresenceInterface
-        base-protocol.h
-        DBusError
-        dbus-error.h
-        DBusObject
-        dbus-object.h
-        DBusService
-        dbus-service.h
-        ServiceTypes
-        service-types.h)
-
-    # Generated headers which will be installed and exported
-    set(telepathy_qt_service_gen_HEADERS
-        ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-channel.h
-        ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-connection.h
-        ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-connection-manager.h)
-
-    # Headers file moc will be run on
-    set(telepathy_qt_service_MOC_SRCS
-        abstract-adaptor.h
-        base-connection-manager.h
-        base-connection-manager-internal.h
-        base-connection.h
-        base-connection-internal.h
-        base-protocol.h
-        base-protocol-internal.h
-        dbus-object.h
-        dbus-service.h)
-
-    add_custom_target(all-generated-service-sources)
-
-    set(SPECS
-        svc-channel
-        svc-connection
-        svc-connection-manager)
-    foreach(spec ${SPECS})
-        tpqt_xincludator(${spec}-spec-xincludator ${CMAKE_CURRENT_SOURCE_DIR}/${spec}.xml ${CMAKE_CURRENT_BINARY_DIR}/_gen/spec-${spec}.xml
-                         DEPENDS stable-typesgen)
-        set(NEW_FILES
-            ${CMAKE_CURRENT_BINARY_DIR}/_gen/${spec}.h
-            ${CMAKE_CURRENT_BINARY_DIR}/_gen/${spec}.cpp
-            ${CMAKE_CURRENT_BINARY_DIR}/_gen/${spec}.moc.hpp)
-        list(APPEND telepathy_qt_service_SRCS ${NEW_FILES})
-        list(APPEND telepathy_qt_service_generated_specs_mocs "moc-${spec}.moc.hpp")
-        set_source_files_properties(${NEW_FILES} PROPERTIES GENERATED true)
-    endforeach(spec ${SPECS})
-
-    tpqt_service_generator(svc-channel servicechannel Channel Tp::Service DEPENDS svc-channel-spec-xincludator)
-    tpqt_service_generator(svc-connection serviceconn Connection Tp::Service DEPENDS svc-connection-spec-xincludator)
-    tpqt_service_generator(svc-connection-manager servicecm ConnectionManager Tp::Service DEPENDS svc-connection-manager-spec-xincludator)
-
-    if (TARGET doxygen-doc)
-        add_dependencies(doxygen-doc all-generated-service-sources)
-    endif (TARGET doxygen-doc)
-
-    # Create the library
-    #if (ENABLE_COMPILER_COVERAGE)
-    #    add_library(telepathy-qt${QT_VERSION_MAJOR}-service STATIC ${telepathy_qt_service_SRCS})
-    #else (ENABLE_COMPILER_COVERAGE)
-    #    add_library(telepathy-qt${QT_VERSION_MAJOR}-service SHARED ${telepathy_qt_service_SRCS})
-    #endif (ENABLE_COMPILER_COVERAGE)
-    # lets build a static only library until we have a stable API/ABI
-    add_library(telepathy-qt${QT_VERSION_MAJOR}-service STATIC ${telepathy_qt_service_SRCS})
-
-    # generate service moc files
-    foreach(moc_src ${telepathy_qt_service_MOC_SRCS})
-        set(generated_file _gen/${moc_src})
-        string(REPLACE ".h" ".moc.hpp" generated_file ${generated_file})
-        tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_SOURCE_DIR}/${moc_src}
-                                        ${CMAKE_CURRENT_BINARY_DIR}/${generated_file}
-                                        ${telepathy_qt_service_generated_specs_mocs})
-        list(APPEND telepathy_qt_service_SRCS ${CMAKE_CURRENT_BINARY_DIR}/${generated_file})
-        string(REPLACE ".h" ".moc.hpp" moc_src ${moc_src})
-        add_dependencies(telepathy-qt${QT_VERSION_MAJOR}-service "moc-${moc_src}")
-    endforeach(moc_src ${telepathy_qt_service_MOC_SRCS})
-
-    # Link
-    target_link_libraries(telepathy-qt${QT_VERSION_MAJOR}-service
-        ${QT_QTDBUS_LIBRARY}
-        ${QT_QTCORE_LIBRARY}
-        telepathy-qt${QT_VERSION_MAJOR}
-        ${TP_QT_LIBRARY_LINKER_FLAGS})
-
-    # Set the correct version number
-    set_target_properties(telepathy-qt${QT_VERSION_MAJOR}-service PROPERTIES
-                                                 SOVERSION ${TP_QT_ABI_VERSION}
-                                                 VERSION ${TP_QT_LIBRARY_VERSION})
-
-    # Install the library - watch out for the correct components
-    if (WIN32)
-        install(TARGETS telepathy-qt${QT_VERSION_MAJOR}-service
-                EXPORT  TelepathyQt${QT_VERSION_MAJOR}Targets
-                RUNTIME DESTINATION ${LIB_INSTALL_DIR} COMPONENT service
-                ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT service_libs)
-    else (WIN32)
-        install(TARGETS telepathy-qt${QT_VERSION_MAJOR}-service
-                EXPORT  TelepathyQt${QT_VERSION_MAJOR}Targets
-                LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT service
-                ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT service_libs)
-    endif (WIN32)
-
-    # Install headers
-    install(FILES ${telepathy_qt_service_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}/TelepathyQt
-            COMPONENT service_headers)
-    install(FILES ${telepathy_qt_service_gen_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}/TelepathyQt/_gen
-            COMPONENT service_headers)
-
-    # pkg-config files, only if not on windows
-    if (NOT WIN32)
-        configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TelepathyQtService.pc.in ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}Service.pc)
-        configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TelepathyQtService-uninstalled.pc.in ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}Service-uninstalled.pc)
-        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}Service.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig COMPONENT pkgconfig)
-    endif (NOT WIN32)
-
-    # Configure the actual Config file
-    configure_file(TelepathyQtServiceConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}ServiceConfig.cmake" @ONLY)
-
-    # this file is used by to check if the installed version can be used.
-    macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}ServiceConfigVersion.cmake
-                                         ${PACKAGE_VERSION})
-
-    if(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
-        set(_TelepathyQtServiceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/TelepathyQt${QT_VERSION_MAJOR}Service)
-    else(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
-        set(_TelepathyQtServiceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/TelepathyQt${QT_VERSION_MAJOR}Service/cmake)
-    endif(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
-
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}ServiceConfigVersion.cmake
-                  ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}ServiceConfig.cmake
-            DESTINATION ${_TelepathyQtServiceConfig_INSTALL_DIR}
-            COMPONENT headers)
-
-endif(ENABLE_EXPERIMENTAL_SERVICE_SUPPORT)
 
=== removed directory '.pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farsight'
=== removed file '.pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farsight/CMakeLists.txt'
--- .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farsight/CMakeLists.txt	2013-06-06 04:56:14 +0000
+++ .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farsight/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-if(FARSIGHT_COMPONENTS_FOUND)
-    include_directories(${TELEPATHY_FARSIGHT_INCLUDE_DIR}
-                        ${GSTREAMER_INCLUDE_DIR}
-                        ${GLIB2_INCLUDE_DIR}
-                        ${LIBXML2_INCLUDE_DIR}
-                        ${DBUS_INCLUDE_DIR})
-
-    # It gets inherited from the previous directory, hence it has to be removed explicitely
-    remove_definitions(-DBUILDING_TP_QT)
-    # We are building Telepathy-Qt-Farsight
-    add_definitions(-DBUILDING_TP_QT_FARSIGHT -DQT_NO_KEYWORDS)
-
-    set(telepathy_qt_farsight_SRCS
-        channel.cpp)
-
-    set(telepathy_qt_farsight_HEADERS
-        Channel
-        channel.h
-        global.h)
-
-    # Create the library
-    if (ENABLE_COMPILER_COVERAGE)
-        add_library(telepathy-qt${QT_VERSION_MAJOR}-farsight STATIC ${telepathy_qt_farsight_SRCS})
-    else (ENABLE_COMPILER_COVERAGE)
-        add_library(telepathy-qt${QT_VERSION_MAJOR}-farsight SHARED ${telepathy_qt_farsight_SRCS})
-    endif (ENABLE_COMPILER_COVERAGE)
-    # Link
-    target_link_libraries(telepathy-qt${QT_VERSION_MAJOR}-farsight
-        ${QT_QTDBUS_LIBRARY}
-        ${QT_QTCORE_LIBRARY}
-        ${TELEPATHY_FARSIGHT_LIBRARIES}
-        ${GSTREAMER_INTERFACE_LIBRARY}
-        telepathy-qt${QT_VERSION_MAJOR}
-        ${TP_QT_LIBRARY_LINKER_FLAGS})
-
-    # Set the correct version number
-    set_target_properties(telepathy-qt${QT_VERSION_MAJOR}-farsight PROPERTIES
-                                                 SOVERSION ${TP_QT_ABI_VERSION}
-                                                 VERSION ${TP_QT_LIBRARY_VERSION})
-
-    # Install the library - watch out for the correct components
-    if (WIN32)
-        install(TARGETS telepathy-qt${QT_VERSION_MAJOR}-farsight
-                EXPORT  TelepathyQt${QT_VERSION_MAJOR}Targets
-                RUNTIME DESTINATION ${LIB_INSTALL_DIR} COMPONENT farsight
-                ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT farsight_libs)
-    else (WIN32)
-        install(TARGETS telepathy-qt${QT_VERSION_MAJOR}-farsight
-                EXPORT  TelepathyQt${QT_VERSION_MAJOR}Targets
-                LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT farsight
-                ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT farsight_libs)
-    endif (WIN32)
-
-    # Install headers
-    install(FILES ${telepathy_qt_farsight_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}/TelepathyQt/Farsight
-            COMPONENT farsight_headers)
-
-    # pkg-config files, only if not on windows
-    if (NOT WIN32)
-        configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TelepathyQtFarsight.pc.in ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}Farsight.pc)
-        configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TelepathyQtFarsight-uninstalled.pc.in ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}Farsight-uninstalled.pc)
-        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}Farsight.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig COMPONENT pkgconfig)
-    endif (NOT WIN32)
-
-    # Configure the actual Config file
-    configure_file(TelepathyQtFarsightConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}FarsightConfig.cmake" @ONLY)
-
-    # this file is used by to check if the installed version can be used.
-    macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}FarsightConfigVersion.cmake
-                                         ${PACKAGE_VERSION})
-
-    if(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
-        set(_TelepathyQtFarsightConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/TelepathyQt${QT_VERSION_MAJOR}Farsight)
-    else(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
-        set(_TelepathyQtFarsightConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/TelepathyQt${QT_VERSION_MAJOR}Farsight/cmake)
-    endif(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
-
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}FarsightConfigVersion.cmake
-                  ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}FarsightConfig.cmake
-            DESTINATION ${_TelepathyQtFarsightConfig_INSTALL_DIR}
-            COMPONENT headers)
-
-endif(FARSIGHT_COMPONENTS_FOUND)
 
=== removed file '.pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farsight/TelepathyQtFarsight-uninstalled.pc.in'
--- .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farsight/TelepathyQtFarsight-uninstalled.pc.in	2013-06-06 04:56:14 +0000
+++ .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farsight/TelepathyQtFarsight-uninstalled.pc.in	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-prefix=/nonexistent
-exec_prefix=/nonexistent
-abs_top_builddir=${CMAKE_BINARY_DIR}
-abs_top_srcdir=${CMAKE_SOURCE_DIR}
-
-Name: TelepathyQt${QT_VERSION_MAJOR}Farsight (uninstalled copy)
-Description: Qt Telepathy Farsight utility library for the Telepathy framework
-Version: ${PACKAGE_VERSION}
-Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farsight >= ${TELEPATHY_FARSIGHT_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
-Libs: ${CMAKE_BINARY_DIR}/TelepathyQt/Farsight/libtelepathy-qt${QT_VERSION_MAJOR}-farsight.so
-Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR}
 
=== removed file '.pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farsight/TelepathyQtFarsight.pc.in'
--- .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farsight/TelepathyQtFarsight.pc.in	2013-06-06 04:56:14 +0000
+++ .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farsight/TelepathyQtFarsight.pc.in	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-prefix=${CMAKE_INSTALL_PREFIX}
-exec_prefix=${CMAKE_INSTALL_PREFIX}
-libdir=${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}
-includedir=${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}
-
-Name: TelepathyQt${QT_VERSION_MAJOR}Farsight
-Description: Qt Telepathy Farsight utility library for the Telepathy framework
-Version: ${PACKAGE_VERSION}
-Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farsight >= ${TELEPATHY_FARSIGHT_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
-Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt${QT_VERSION_MAJOR}-farsight
-Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}
 
=== removed file '.pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farsight/TelepathyQtFarsightConfig.cmake.in'
--- .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farsight/TelepathyQtFarsightConfig.cmake.in	2013-06-06 04:56:14 +0000
+++ .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farsight/TelepathyQtFarsightConfig.cmake.in	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-# TelepathyQt@[e-mail] is generated by CMake from TelepathyQt/TelepathyQtFarsightConfig.cmake.in.
-# Any changed value in this file will be overwritten by CMake.
-
-if(NOT TelepathyQt@QT_VERSION_MAJOR@Farsight_FOUND)
-    # set the version number
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_VERSION_MAJOR @TP_QT_MAJOR_VERSION@)
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_VERSION_MINOR @TP_QT_MINOR_VERSION@)
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_VERSION_MICRO @TP_QT_MICRO_VERSION@)
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_VERSION_NANO @TP_QT_NANO_VERSION@)
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_VERSION @PACKAGE_VERSION@)
-
-    # set the directories
-    if(NOT TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_INSTALL_DIR)
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_INSTALL_DIR "@CMAKE_INSTALL_PREFIX@")
-    endif(NOT TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_INSTALL_DIR)
-
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_INCLUDE_DIR              "@TELEPATHY_QT_INCLUDE_DIR@")
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_LIB_DIR                  "@TELEPATHY_QT_LIB_DIR@")
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_SHARE_DIR                "@TELEPATHY_QT_DATA_DIR@")
-
-    find_package(TelepathyQt@QT_VERSION_MAJOR@ REQUIRED)
-
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_LIBRARIES telepathy-qt@QT_VERSION_MAJOR@-farsight)
-endif(NOT TelepathyQt@QT_VERSION_MAJOR@Farsight_FOUND)
 
=== removed file '.pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farsight/channel.cpp'
--- .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farsight/channel.cpp	2013-06-06 04:56:14 +0000
+++ .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farsight/channel.cpp	1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-/**
- * This file is part of TelepathyQt
- *
- * @copyright Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
- * @copyright Copyright (C) 2009 Nokia Corporation
- * @license LGPL 2.1
- *
- * 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 <TelepathyQt/Farsight/Channel>
-
-#include "TelepathyQt/debug-internal.h"
-
-#include <TelepathyQt/Channel>
-#include <TelepathyQt/Connection>
-#include <TelepathyQt/StreamedMediaChannel>
-
-#include <telepathy-glib/automatic-client-factory.h>
-#include <telepathy-glib/channel.h>
-#include <telepathy-glib/connection.h>
-#include <telepathy-glib/dbus.h>
-
-#include <telepathy-farsight/channel.h>
-
-namespace Tp
-{
-
-TfChannel *createFarsightChannel(const StreamedMediaChannelPtr &channel)
-{
-    if (!channel->handlerStreamingRequired()) {
-        warning() << "Handler streaming not required";
-        return 0;
-    }
-
-    TpDBusDaemon *dbus = tp_dbus_daemon_dup(0);
-
-    if (!dbus) {
-        warning() << "Unable to connect to D-Bus";
-        return 0;
-    }
-
-    ConnectionPtr connection = channel->connection();
-
-    TpSimpleClientFactory *factory = (TpSimpleClientFactory *)
-            tp_automatic_client_factory_new (dbus);
-    if (!factory) {
-        warning() << "Unable to construct TpAutomaticClientFactory";
-        g_object_unref(dbus);
-        return 0;
-    }
-
-    TpConnection *gconnection = tp_simple_client_factory_ensure_connection (factory,
-            connection->objectPath().toAscii(), NULL, 0);
-    g_object_unref(factory);
-    factory = 0;
-    g_object_unref(dbus);
-    dbus = 0;
-
-    if (!gconnection) {
-        warning() << "Unable to construct TpConnection";
-        return 0;
-    }
-
-    TpChannel *gchannel = tp_channel_new(gconnection,
-            channel->objectPath().toAscii(),
-            TP_QT_IFACE_CHANNEL_TYPE_STREAMED_MEDIA.latin1(),
-            (TpHandleType) channel->targetHandleType(),
-            channel->targetHandle(),
-            0);
-    g_object_unref(gconnection);
-    gconnection = 0;
-
-    if (!gchannel) {
-        warning() << "Unable to construct TpChannel";
-        return 0;
-    }
-
-    TfChannel *ret = tf_channel_new(gchannel);
-    g_object_unref(gchannel);
-    gchannel = 0;
-
-    return ret;
-}
-
-} // Tp
 
=== removed directory '.pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farstream'
=== removed file '.pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farstream/CMakeLists.txt'
--- .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farstream/CMakeLists.txt	2013-06-06 04:56:14 +0000
+++ .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farstream/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,105 +0,0 @@
-if(FARSTREAM_COMPONENTS_FOUND)
-    include_directories(${TELEPATHY_FARSTREAM_INCLUDE_DIR}
-                        ${TELEPATHY_GLIB_INCLUDE_DIR}
-                        ${FARSTREAM_INCLUDE_DIR}
-                        ${GSTREAMER_INCLUDE_DIR}
-                        ${GLIB2_INCLUDE_DIR}
-                        ${LIBXML2_INCLUDE_DIR}
-                        ${DBUS_INCLUDE_DIR})
-
-    # It gets inherited from the previous directory, hence it has to be removed explicitely
-    remove_definitions(-DBUILDING_TP_QT)
-    # We are building Telepathy-Qt-Farstream
-    add_definitions(-DBUILDING_TP_QT_FARSTREAM -DQT_NO_KEYWORDS)
-
-    set(telepathy_qt_farstream_SRCS
-        channel.cpp)
-
-    set(telepathy_qt_farstream_HEADERS
-        Channel
-        channel.h
-        Global
-        global.h
-        PendingChannel)
-
-    set(telepathy_qt_farstream_MOC_SRCS
-        channel.h)
-
-    # generate client moc files
-    tpqt_generate_mocs(${telepathy_qt_farstream_MOC_SRCS})
-
-    # Create the library
-    if (ENABLE_COMPILER_COVERAGE)
-        add_library(telepathy-qt${QT_VERSION_MAJOR}-farstream STATIC
-                    ${telepathy_qt_farstream_SRCS} ${telepathy_qt_farstream_MOC_SRCS})
-    else (ENABLE_COMPILER_COVERAGE)
-        add_library(telepathy-qt${QT_VERSION_MAJOR}-farstream SHARED
-                    ${telepathy_qt_farstream_SRCS} ${telepathy_qt_farstream_MOC_SRCS})
-    endif (ENABLE_COMPILER_COVERAGE)
-
-    # Link
-    target_link_libraries(telepathy-qt${QT_VERSION_MAJOR}-farstream
-        ${QT_QTDBUS_LIBRARY}
-        ${QT_QTCORE_LIBRARY}
-        ${TELEPATHY_FARSTREAM_LIBRARIES}
-        ${TELEPATHY_GLIB_LIBRARIES}
-        telepathy-qt${QT_VERSION_MAJOR}
-        ${TP_QT_LIBRARY_LINKER_FLAGS})
-
-    if (ENABLE_COMPILER_COVERAGE)
-        target_link_libraries(telepathy-qt${QT_VERSION_MAJOR}-farstream gcov)
-    endif (ENABLE_COMPILER_COVERAGE)
-
-    # Set the correct version number
-    set_target_properties(telepathy-qt${QT_VERSION_MAJOR}-farstream PROPERTIES
-                                                       SOVERSION ${TP_QT_ABI_VERSION}
-                                                       VERSION ${TP_QT_LIBRARY_VERSION})
-
-    # Install the library - watch out for the correct components
-    if (WIN32)
-        install(TARGETS telepathy-qt${QT_VERSION_MAJOR}-farstream
-                EXPORT TelepathyQt${QT_VERSION_MAJOR}Targets
-                RUNTIME DESTINATION ${LIB_INSTALL_DIR} COMPONENT farstream
-                ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT farstream_libs)
-    else (WIN32)
-        install(TARGETS telepathy-qt${QT_VERSION_MAJOR}-farstream
-                EXPORT TelepathyQt${QT_VERSION_MAJOR}Targets
-                LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT farstream
-                ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT farstream_libs)
-    endif (WIN32)
-
-    # Install headers
-    install(FILES ${telepathy_qt_farstream_HEADERS}
-            DESTINATION ${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}/TelepathyQt/Farstream
-            COMPONENT farstream_headers)
-
-    # pkg-config files, only if not on windows
-    if (NOT WIN32)
-        configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TelepathyQtFarstream.pc.in
-                       ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}Farstream.pc)
-        configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TelepathyQtFarstream-uninstalled.pc.in
-                       ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}Farstream-uninstalled.pc)
-        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}Farstream.pc
-                DESTINATION ${LIB_INSTALL_DIR}/pkgconfig COMPONENT pkgconfig)
-    endif (NOT WIN32)
-
-    # Configure the actual Config file
-    configure_file(TelepathyQtFarstreamConfig.cmake.in
-                   "${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}FarstreamConfig.cmake" @ONLY)
-
-    # this file is used by to check if the installed version can be used.
-    macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}FarstreamConfigVersion.cmake
-                                         ${PACKAGE_VERSION})
-
-    if(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
-        set(_TelepathyQtFarstreamConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/TelepathyQt${QT_VERSION_MAJOR}Farstream)
-    else(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
-        set(_TelepathyQtFarstreamConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/TelepathyQt${QT_VERSION_MAJOR}Farstream/cmake)
-    endif(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR)
-
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}FarstreamConfigVersion.cmake
-                  ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}FarstreamConfig.cmake
-            DESTINATION ${_TelepathyQtFarstreamConfig_INSTALL_DIR}
-            COMPONENT headers)
-
-endif(FARSTREAM_COMPONENTS_FOUND)
 
=== removed file '.pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in'
--- .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in	2013-06-06 04:56:14 +0000
+++ .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-prefix=/nonexistent
-exec_prefix=/nonexistent
-abs_top_builddir=${CMAKE_BINARY_DIR}
-abs_top_srcdir=${CMAKE_SOURCE_DIR}
-
-Name: TelepathyQt${QT_VERSION_MAJOR}Farstream (uninstalled copy)
-Description: Qt Telepathy Farstream utility library for the Telepathy framework
-Version: ${PACKAGE_VERSION}
-Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
-Libs: ${CMAKE_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}/Farstream/libtelepathy-qt${QT_VERSION_MAJOR}-farstream.so
-Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR}
 
=== removed file '.pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in'
--- .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in	2013-06-06 04:56:14 +0000
+++ .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-prefix=${CMAKE_INSTALL_PREFIX}
-exec_prefix=${CMAKE_INSTALL_PREFIX}
-libdir=${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}
-includedir=${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}
-
-Name: TelepathyQt${QT_VERSION_MAJOR}Farstream
-Description: Qt Telepathy Farstream utility library for the Telepathy framework
-Version: ${PACKAGE_VERSION}
-Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
-Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt${QT_VERSION_MAJOR}-farstream
-Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}
 
=== removed file '.pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farstream/TelepathyQtFarstreamConfig.cmake.in'
--- .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farstream/TelepathyQtFarstreamConfig.cmake.in	2013-06-06 04:56:14 +0000
+++ .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farstream/TelepathyQtFarstreamConfig.cmake.in	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-# TelepathyQt@[e-mail] is generated by CMake from TelepathyQt/TelepathyQtFarstreamConfig.cmake.in.
-# Any changed value in this file will be overwritten by CMake.
-
-if(NOT TelepathyQt@QT_VERSION_MAJOR@Farstream_FOUND)
-    # set the version number
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSTREAM_VERSION_MAJOR @TP_QT_MAJOR_VERSION@)
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSTREAM_VERSION_MINOR @TP_QT_MINOR_VERSION@)
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSTREAM_VERSION_MICRO @TP_QT_MICRO_VERSION@)
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSTREAM_VERSION_NANO @TP_QT_NANO_VERSION@)
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSTREAM_VERSION @PACKAGE_VERSION@)
-
-    # set the directories
-    if(NOT TELEPATHY_QT@QT_VERSION_MAJOR@_FARSTREAM_INSTALL_DIR)
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSTREAM_INSTALL_DIR "@CMAKE_INSTALL_PREFIX@")
-    endif(NOT TELEPATHY_QT@QT_VERSION_MAJOR@_FARSTREAM_INSTALL_DIR)
-
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSTREAM_INCLUDE_DIR              "@TELEPATHY_QT_INCLUDE_DIR@")
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSTREAM_LIB_DIR                  "@TELEPATHY_QT_LIB_DIR@")
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSTREAM_SHARE_DIR                "@TELEPATHY_QT_DATA_DIR@")
-
-    find_package(TelepathyQt@QT_VERSION_MAJOR@ REQUIRED)
-
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSTREAM_LIBRARIES telepathy-qt@QT_VERSION_MAJOR@-farstream)
-endif(NOT TelepathyQt@QT_VERSION_MAJOR@Farstream_FOUND)
 
=== removed file '.pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farstream/channel.cpp'
--- .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farstream/channel.cpp	2013-06-06 04:56:14 +0000
+++ .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/Farstream/channel.cpp	1970-01-01 00:00:00 +0000
@@ -1,166 +0,0 @@
-/**
- * This file is part of TelepathyQt
- *
- * Copyright © 2009-2012 Collabora Ltd. <http://www.collabora.co.uk/>
- * Copyright © 2009 Nokia Corporation
- *
- * 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 <TelepathyQt/Farstream/Channel>
-
-#include "TelepathyQt/Farstream/_gen/channel.moc.hpp"
-
-#include "TelepathyQt/debug-internal.h"
-
-#include <TelepathyQt/CallChannel>
-#include <TelepathyQt/Connection>
-
-#include <telepathy-farstream/telepathy-farstream.h>
-#include <telepathy-glib/automatic-client-factory.h>
-#include <telepathy-glib/call-channel.h>
-#include <telepathy-glib/connection.h>
-#include <telepathy-glib/dbus.h>
-
-namespace Tp
-{
-namespace Farstream
-{
-
-struct TP_QT_FS_NO_EXPORT PendingChannel::Private
-{
-    Private()
-        : mTfChannel(0)
-    {
-    }
-
-    static void onTfChannelNewFinish(GObject *sourceObject, GAsyncResult *res, gpointer userData);
-
-    TfChannel *mTfChannel;
-};
-
-PendingChannel::PendingChannel(const CallChannelPtr &channel)
-    : Tp::PendingOperation(channel),
-      mPriv(new PendingChannel::Private)
-{
-    if (!channel->handlerStreamingRequired()) {
-        warning() << "Handler streaming not required";
-        setFinishedWithError(TP_QT_ERROR_NOT_AVAILABLE,
-                QLatin1String("Handler streaming not required"));
-        return;
-    }
-
-    TpDBusDaemon *dbus = tp_dbus_daemon_dup(0);
-    if (!dbus) {
-        warning() << "Unable to connect to D-Bus";
-        setFinishedWithError(TP_QT_ERROR_NOT_AVAILABLE,
-                QLatin1String("Unable to connect to D-Bus"));
-        return;
-    }
-
-    Tp::ConnectionPtr connection = channel->connection();
-    if (connection.isNull()) {
-        warning() << "Connection not available";
-        setFinishedWithError(TP_QT_ERROR_NOT_AVAILABLE,
-                QLatin1String("Connection not available"));
-        g_object_unref(dbus);
-        return;
-    }
-
-    TpSimpleClientFactory *factory = (TpSimpleClientFactory *)
-            tp_automatic_client_factory_new (dbus);
-    if (!factory) {
-        warning() << "Unable to construct TpAutomaticClientFactory";
-        setFinishedWithError(TP_QT_ERROR_NOT_AVAILABLE,
-                QLatin1String("Unable to construct TpAutomaticClientFactory"));
-        g_object_unref(dbus);
-        return;
-    }
-
-    TpConnection *gconnection = tp_simple_client_factory_ensure_connection (factory,
-            connection->objectPath().toAscii(), NULL, 0);
-    if (!gconnection) {
-        warning() << "Unable to construct TpConnection";
-        setFinishedWithError(TP_QT_ERROR_NOT_AVAILABLE,
-                QLatin1String("Unable to construct TpConnection"));
-        g_object_unref(factory);
-        g_object_unref(dbus);
-        return;
-    }
-
-    TpChannel *gchannel = (TpChannel*) g_object_new(TP_TYPE_CALL_CHANNEL,
-            "bus-name", connection->busName().toAscii().constData(),
-            "connection", gconnection,
-            "dbus-daemon", dbus,
-            "object-path", channel->objectPath().toAscii().constData(),
-            NULL);
-    g_object_unref(factory);
-    factory = 0;
-    g_object_unref(dbus);
-    dbus = 0;
-    g_object_unref(gconnection);
-    gconnection = 0;
-    if (!gchannel) {
-        warning() << "Unable to construct TpChannel";
-        setFinishedWithError(TP_QT_ERROR_NOT_AVAILABLE,
-                QLatin1String("Unable to construct TpChannel"));
-        return;
-    }
-
-    tf_channel_new_async(gchannel, PendingChannel::Private::onTfChannelNewFinish, this);
-    g_object_unref(gchannel);
-}
-
-PendingChannel::~PendingChannel()
-{
-    delete mPriv;
-}
-
-void PendingChannel::Private::onTfChannelNewFinish(GObject *sourceObject,
-        GAsyncResult *res, gpointer userData)
-{
-    PendingChannel *self = reinterpret_cast<PendingChannel *>(userData);
-
-    GError *error = NULL;
-    TfChannel *ret = tf_channel_new_finish(sourceObject, res, &error);
-    if (error) {
-        warning() << "Fs::PendingChannel::Private::onTfChannelNewFinish: error " << error->message;
-        self->setFinishedWithError(TP_QT_ERROR_NOT_AVAILABLE, QLatin1String(error->message));
-        g_clear_error(&error);
-        return;
-    }
-
-    self->mPriv->mTfChannel = ret;
-    self->setFinished();
-}
-
-TfChannel *PendingChannel::tfChannel() const
-{
-    return mPriv->mTfChannel;
-}
-
-CallChannelPtr PendingChannel::callChannel() const
-{
-    return CallChannelPtr::staticCast(object());
-}
-
-PendingChannel *createChannel(const CallChannelPtr &channel)
-{
-    PendingChannel *ptf = new PendingChannel(channel);
-    return ptf;
-}
-
-} // Farstream
-} // Tp
 
=== removed file '.pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/TelepathyQt-uninstalled.pc.in'
--- .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/TelepathyQt-uninstalled.pc.in	2013-06-06 04:56:14 +0000
+++ .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/TelepathyQt-uninstalled.pc.in	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-prefix=/nonexistent
-exec_prefix=/nonexistent
-abs_top_builddir=${CMAKE_BINARY_DIR}
-abs_top_srcdir=${CMAKE_SOURCE_DIR}
-
-Name: TelepathyQt${QT_VERSION_MAJOR} (uninstalled copy)
-Description: Qt utility library for the Telepathy framework
-Version: ${PACKAGE_VERSION}
-Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, QtNetwork >= ${QT_MIN_VERSION}, QtNetwork < ${QT_MAX_VERSION}, QtXml >= ${QT_MIN_VERSION}, QtXml < ${QT_MAX_VERSION}
-Libs: ${CMAKE_BINARY_DIR}/TelepathyQt/libtelepathy-qt${QT_VERSION_MAJOR}.so
-Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR}
 
=== removed file '.pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/TelepathyQt.pc.in'
--- .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/TelepathyQt.pc.in	2013-06-06 04:56:14 +0000
+++ .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/TelepathyQt.pc.in	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-prefix=${CMAKE_INSTALL_PREFIX}
-exec_prefix=${CMAKE_INSTALL_PREFIX}
-libdir=${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}
-includedir=${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}
-
-Name: TelepathyQt${QT_VERSION_MAJOR}
-Description: Qt utility library for the Telepathy framework
-Version: ${PACKAGE_VERSION}
-Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, QtNetwork >= ${QT_MIN_VERSION}, QtNetwork < ${QT_MAX_VERSION}, QtXml >= ${QT_MIN_VERSION}, QtXml < ${QT_MAX_VERSION}
-Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt${QT_VERSION_MAJOR}
-Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}
 
=== removed file '.pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/TelepathyQtConfig.cmake.in'
--- .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/TelepathyQtConfig.cmake.in	2013-06-06 04:56:14 +0000
+++ .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/TelepathyQtConfig.cmake.in	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-# TelepathyQt@[e-mail] is generated by CMake from TelepathyQt/TelepathyQtConfig.cmake.in.
-# Any changed value in this file will be overwritten by CMake.
-
-if(NOT TelepathyQt@QT_VERSION_MAJOR@_FOUND)
-    # set the version number
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_VERSION_MAJOR @TP_QT_MAJOR_VERSION@)
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_VERSION_MINOR @TP_QT_MINOR_VERSION@)
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_VERSION_MICRO @TP_QT_MICRO_VERSION@)
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_VERSION_NANO @TP_QT_NANO_VERSION@)
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_VERSION @PACKAGE_VERSION@)
-
-    # set the directories
-    if(NOT TELEPATHY_QT@QT_VERSION_MAJOR@_INSTALL_DIR)
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_INSTALL_DIR "@CMAKE_INSTALL_PREFIX@")
-    endif(NOT TELEPATHY_QT@QT_VERSION_MAJOR@_INSTALL_DIR)
-
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_INCLUDE_DIR              "@TELEPATHY_QT_INCLUDE_DIR@")
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_LIB_DIR                  "@TELEPATHY_QT_LIB_DIR@")
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_SHARE_DIR                "@TELEPATHY_QT_DATA_DIR@")
-
-    # attempt to find the generated TelepathyQt4Targets.cmake in the same directory
-    get_filename_component(_TPQT@QT_VERSION_MAJOR@_CONFIG_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-    find_file(_TPQT@QT_VERSION_MAJOR@_TARGETS_FILE TelepathyQt@[e-mail] PATHS ${_TPQT@QT_VERSION_MAJOR@_CONFIG_DIR} NO_DEFAULT_PATH)
-
-    # set the TELEPATHY_QT@QT_VERSION_MAJOR@_LIBRARIES variable
-    include(${_TPQT@QT_VERSION_MAJOR@_TARGETS_FILE})
-    set(TELEPATHY_QT@QT_VERSION_MAJOR@_LIBRARIES telepathy-qt@QT_VERSION_MAJOR@)
-endif(NOT TelepathyQt@QT_VERSION_MAJOR@_FOUND)
 
=== removed file '.pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/TelepathyQtService-uninstalled.pc.in'
--- .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/TelepathyQtService-uninstalled.pc.in	2013-06-06 04:56:14 +0000
+++ .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/TelepathyQtService-uninstalled.pc.in	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-prefix=/nonexistent
-exec_prefix=/nonexistent
-abs_top_builddir=${CMAKE_BINARY_DIR}
-abs_top_srcdir=${CMAKE_SOURCE_DIR}
-
-Name: TelepathyQt${QT_VERSION_MAJOR}Service (uninstalled copy)
-Description: Qt Telepathy Service side bindings
-Version: ${PACKAGE_VERSION}
-Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
-Libs: ${CMAKE_BINARY_DIR}/TelepathyQt/Farsight/libtelepathy-qt${QT_VERSION_MAJOR}-service.so
-Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR}
 
=== removed file '.pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/TelepathyQtService.pc.in'
--- .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/TelepathyQtService.pc.in	2013-06-06 04:56:14 +0000
+++ .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/TelepathyQtService.pc.in	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-prefix=${CMAKE_INSTALL_PREFIX}
-exec_prefix=${CMAKE_INSTALL_PREFIX}
-libdir=${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}
-includedir=${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}
-
-Name: TelepathyQt${QT_VERSION_MAJOR}Service
-Description: Qt Telepathy Service side bindings
-Version: ${PACKAGE_VERSION}
-Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
-Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt${QT_VERSION_MAJOR}-service
-Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}
 
=== removed file '.pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/TelepathyQtServiceConfig.cmake.in'
--- .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/TelepathyQtServiceConfig.cmake.in	2013-06-06 04:56:14 +0000
+++ .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/TelepathyQtServiceConfig.cmake.in	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-# TelepathyQt@[e-mail] is generated by CMake from TelepathyQt/TelepathyQtServiceConfig.cmake.in.
-# Any changed value in this file will be overwritten by CMake.
-
-# set the version number
-set(TELEPATHY_QT@QT_VERSION_MAJOR@_SERVICE_VERSION_MAJOR @TP_QT_MAJOR_VERSION@)
-set(TELEPATHY_QT@QT_VERSION_MAJOR@_SERVICE_VERSION_MINOR @TP_QT_MINOR_VERSION@)
-set(TELEPATHY_QT@QT_VERSION_MAJOR@_SERVICE_VERSION_MICRO @TP_QT_MICRO_VERSION@)
-set(TELEPATHY_QT@QT_VERSION_MAJOR@_SERVICE_VERSION_NANO @TP_QT_NANO_VERSION@)
-set(TELEPATHY_QT@QT_VERSION_MAJOR@_SERVICE_VERSION @PACKAGE_VERSION@)
-
-# set the directories
-if(NOT TELEPATHY_QT@QT_VERSION_MAJOR@_SERVICE_INSTALL_DIR)
-   set(TELEPATHY_QT@QT_VERSION_MAJOR@_SERVICE_INSTALL_DIR "@CMAKE_INSTALL_PREFIX@")
-endif(NOT TELEPATHY_QT@QT_VERSION_MAJOR@_SERVICE_INSTALL_DIR)
-
-set(TELEPATHY_QT@QT_VERSION_MAJOR@_SERVICE_INCLUDE_DIR              "@TELEPATHY_QT_INCLUDE_DIR@")
-set(TELEPATHY_QT@QT_VERSION_MAJOR@_SERVICE_LIB_DIR                  "@TELEPATHY_QT_LIB_DIR@")
-set(TELEPATHY_QT@QT_VERSION_MAJOR@_SERVICE_SHARE_DIR                "@TELEPATHY_QT_DATA_DIR@")
-
-find_package(TelepathyQt@QT_VERSION_MAJOR@ REQUIRED)
-
-set(TELEPATHY_QT@QT_VERSION_MAJOR@_SERVICE_LIBRARIES telepathy-qt@QT_VERSION_MAJOR@-service)
 
=== removed file '.pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/account.cpp'
--- .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/account.cpp	2013-06-06 04:56:14 +0000
+++ .pc/02-adapt_to_work_with_q5_final.patch/TelepathyQt/account.cpp	1970-01-01 00:00:00 +0000
@@ -1,4858 +0,0 @@
-/**
- * This file is part of TelepathyQt
- *
- * @copyright Copyright (C) 2008-2012 Collabora Ltd. <http://www.collabora.co.uk/>
- * @copyright Copyright (C) 2008 Nokia Corporation
- * @license LGPL 2.1
- *
- * 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 <TelepathyQt/Account>
-
-#include "TelepathyQt/_gen/account.moc.hpp"
-#include "TelepathyQt/_gen/cli-account.moc.hpp"
-#include "TelepathyQt/_gen/cli-account-body.hpp"
-
-#include "TelepathyQt/debug-internal.h"
-
-#include "TelepathyQt/connection-internal.h"
-
-#include <TelepathyQt/AccountManager>
-#include <TelepathyQt/Channel>
-#include <TelepathyQt/ChannelDispatcherInterface>
-#include <TelepathyQt/ConnectionCapabilities>
-#include <TelepathyQt/ConnectionLowlevel>
-#include <TelepathyQt/ConnectionManager>
-#include <TelepathyQt/PendingChannel>
-#include <TelepathyQt/PendingChannelRequest>
-#include <TelepathyQt/PendingFailure>
-#include <TelepathyQt/PendingReady>
-#include <TelepathyQt/PendingStringList>
-#include <TelepathyQt/PendingVariant>
-#include <TelepathyQt/PendingVoid>
-#include <TelepathyQt/Profile>
-#include <TelepathyQt/ReferencedHandles>
-#include <TelepathyQt/Constants>
-#include <TelepathyQt/Debug>
-
-#include <QQueue>
-#include <QRegExp>
-#include <QSharedPointer>
-#include <QTimer>
-#include <QWeakPointer>
-
-#include <string.h>
-
-namespace Tp
-{
-
-namespace
-{
-
-struct PresenceStatusInfo
-{
-    QString name;
-    Tp::SimpleStatusSpec spec;
-};
-
-Tp::ConnectionPresenceType presenceTypeForStatus(const QString &status, bool &maySetOnSelf)
-{
-    static PresenceStatusInfo statuses[] = {
-        { QLatin1String("available"), { Tp::ConnectionPresenceTypeAvailable, true, true } },
-        { QLatin1String("chat"), { Tp::ConnectionPresenceTypeAvailable, true, true } },
-        { QLatin1String("chatty"), { Tp::ConnectionPresenceTypeAvailable, true, true } },
-        { QLatin1String("away"), { Tp::ConnectionPresenceTypeAway, true, true } },
-        { QLatin1String("brb"), { Tp::ConnectionPresenceTypeAway, true, true } },
-        { QLatin1String("out-to-lunch"), { Tp::ConnectionPresenceTypeAway, true, true } },
-        { QLatin1String("xa"), { Tp::ConnectionPresenceTypeExtendedAway, true, true } },
-        { QLatin1String("hidden"), { Tp::ConnectionPresenceTypeHidden, true, true } },
-        { QLatin1String("invisible"), { Tp::ConnectionPresenceTypeHidden, true, true } },
-        { QLatin1String("offline"), { Tp::ConnectionPresenceTypeOffline, true, false } },
-        { QLatin1String("unknown"), { Tp::ConnectionPresenceTypeUnknown, false, false } },
-        { QLatin1String("error"), { Tp::ConnectionPresenceTypeError, false, false } }
-    };
-
-    for (uint i = 0; i < sizeof(statuses) / sizeof(PresenceStatusInfo); ++i) {
-        if (status == statuses[i].name) {
-            maySetOnSelf = statuses[i].spec.maySetOnSelf;
-            return (Tp::ConnectionPresenceType) statuses[i].spec.type;
-        }
-    }
-
-    // fallback to type away if we don't know status
-    maySetOnSelf = true;
-    return Tp::ConnectionPresenceTypeAway;
-}
-
-Tp::PresenceSpec presenceSpecForStatus(const QString &status, bool canHaveStatusMessage)
-{
-    Tp::SimpleStatusSpec spec;
-    spec.type = presenceTypeForStatus(status, spec.maySetOnSelf);
-    spec.canHaveMessage = canHaveStatusMessage;
-    return Tp::PresenceSpec(status, spec);
-}
-
-QVariantMap textChatCommonRequest()
-{
-    QVariantMap request;
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                   TP_QT_IFACE_CHANNEL_TYPE_TEXT);
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
-                   (uint) Tp::HandleTypeContact);
-    return request;
-}
-
-QVariantMap textChatRequest(const QString &contactIdentifier)
-{
-    QVariantMap request = textChatCommonRequest();
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetID"),
-                   contactIdentifier);
-    return request;
-}
-
-QVariantMap textChatRequest(const Tp::ContactPtr &contact)
-{
-    QVariantMap request = textChatCommonRequest();
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle"),
-                   contact ? contact->handle().at(0) : (uint) 0);
-    return request;
-}
-
-QVariantMap textChatroomRequest(const QString &roomName)
-{
-    QVariantMap request;
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                   TP_QT_IFACE_CHANNEL_TYPE_TEXT);
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
-                   (uint) Tp::HandleTypeRoom);
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetID"),
-                   roomName);
-    return request;
-}
-
-QVariantMap callCommonRequest(bool withAudio, const QString &audioName,
-        bool withVideo, const QString &videoName)
-{
-    QVariantMap request;
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                   TP_QT_IFACE_CHANNEL_TYPE_CALL);
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
-                   (uint) Tp::HandleTypeContact);
-
-    if (withAudio) {
-        request.insert(TP_QT_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudio"),
-                       true);
-        if (!audioName.isEmpty()) {
-            request.insert(TP_QT_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialAudioName"),
-                           audioName);
-        }
-    }
-
-    if (withVideo) {
-        request.insert(TP_QT_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialVideo"),
-                       true);
-        if (!videoName.isEmpty()) {
-            request.insert(TP_QT_IFACE_CHANNEL_TYPE_CALL + QLatin1String(".InitialVideoName"),
-                           videoName);
-        }
-    }
-
-    return request;
-}
-
-QVariantMap audioCallRequest(const QString &contactIdentifier, const QString &contentName)
-{
-    QVariantMap request = callCommonRequest(true, contentName, false, QString());
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetID"),
-                   contactIdentifier);
-    return request;
-}
-
-QVariantMap audioCallRequest(const Tp::ContactPtr &contact, const QString &contentName)
-{
-    QVariantMap request = callCommonRequest(true, contentName, false, QString());
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle"),
-                   contact ? contact->handle().at(0) : (uint) 0);
-    return request;
-}
-
-QVariantMap videoCallRequest(const QString &contactIdentifier, const QString &contentName)
-{
-    QVariantMap request = callCommonRequest(false, QString(), true, contentName);
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetID"),
-                   contactIdentifier);
-    return request;
-}
-
-QVariantMap videoCallRequest(const Tp::ContactPtr &contact, const QString &contentName)
-{
-    QVariantMap request = callCommonRequest(false, QString(), true, contentName);
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle"),
-                   contact ? contact->handle().at(0) : (uint) 0);
-    return request;
-}
-
-QVariantMap audioVideoCallRequest(const QString &contactIdentifier,
-        const QString &audioName,
-        const QString &videoName)
-{
-    QVariantMap request = callCommonRequest(true, audioName, true, videoName);
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetID"),
-                   contactIdentifier);
-    return request;
-}
-
-QVariantMap audioVideoCallRequest(const Tp::ContactPtr &contact,
-        const QString &audioName,
-        const QString &videoName)
-{
-    QVariantMap request = callCommonRequest(true, audioName, true, videoName);
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle"),
-                   contact ? contact->handle().at(0) : (uint) 0);
-    return request;
-}
-
-QVariantMap streamedMediaCallCommonRequest()
-{
-    QVariantMap request;
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                   TP_QT_IFACE_CHANNEL_TYPE_STREAMED_MEDIA);
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
-                   (uint) Tp::HandleTypeContact);
-    return request;
-}
-
-QVariantMap streamedMediaCallRequest(const QString &contactIdentifier)
-{
-    QVariantMap request = streamedMediaCallCommonRequest();
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetID"),
-                   contactIdentifier);
-    return request;
-}
-
-QVariantMap streamedMediaCallRequest(const Tp::ContactPtr &contact)
-{
-    QVariantMap request = streamedMediaCallCommonRequest();
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle"),
-                   contact ? contact->handle().at(0) : (uint) 0);
-    return request;
-}
-
-QVariantMap streamedMediaAudioCallRequest(const QString &contactIdentifier)
-{
-    QVariantMap request = streamedMediaCallRequest(contactIdentifier);
-    request.insert(TP_QT_IFACE_CHANNEL_TYPE_STREAMED_MEDIA + QLatin1String(".InitialAudio"),
-                   true);
-    return request;
-}
-
-QVariantMap streamedMediaAudioCallRequest(const Tp::ContactPtr &contact)
-{
-    QVariantMap request = streamedMediaCallRequest(contact);
-    request.insert(TP_QT_IFACE_CHANNEL_TYPE_STREAMED_MEDIA + QLatin1String(".InitialAudio"),
-                   true);
-    return request;
-}
-
-QVariantMap streamedMediaVideoCallRequest(const QString &contactIdentifier, bool withAudio)
-{
-    QVariantMap request = streamedMediaCallRequest(contactIdentifier);
-    request.insert(TP_QT_IFACE_CHANNEL_TYPE_STREAMED_MEDIA + QLatin1String(".InitialVideo"),
-                   true);
-    if (withAudio) {
-        request.insert(TP_QT_IFACE_CHANNEL_TYPE_STREAMED_MEDIA + QLatin1String(".InitialAudio"),
-                       true);
-    }
-    return request;
-}
-
-QVariantMap streamedMediaVideoCallRequest(const Tp::ContactPtr &contact, bool withAudio)
-{
-    QVariantMap request = streamedMediaCallRequest(contact);
-    request.insert(TP_QT_IFACE_CHANNEL_TYPE_STREAMED_MEDIA + QLatin1String(".InitialVideo"),
-                   true);
-    if (withAudio) {
-        request.insert(TP_QT_IFACE_CHANNEL_TYPE_STREAMED_MEDIA + QLatin1String(".InitialAudio"),
-                       true);
-    }
-    return request;
-}
-
-QVariantMap fileTransferCommonRequest(const Tp::FileTransferChannelCreationProperties &properties)
-{
-    if (!properties.isValid()) {
-        warning() << "Invalid file transfer creation properties";
-        return QVariantMap();
-    }
-
-    QVariantMap request;
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                   TP_QT_IFACE_CHANNEL_TYPE_FILE_TRANSFER);
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
-                   (uint) Tp::HandleTypeContact);
-
-    request.insert(TP_QT_IFACE_CHANNEL_TYPE_FILE_TRANSFER + QLatin1String(".Filename"),
-                   properties.suggestedFileName());
-    request.insert(TP_QT_IFACE_CHANNEL_TYPE_FILE_TRANSFER + QLatin1String(".ContentType"),
-                   properties.contentType());
-    request.insert(TP_QT_IFACE_CHANNEL_TYPE_FILE_TRANSFER + QLatin1String(".Size"),
-                   properties.size());
-
-    if (properties.hasContentHash()) {
-        request.insert(TP_QT_IFACE_CHANNEL_TYPE_FILE_TRANSFER + QLatin1String(".ContentHashType"),
-                       (uint) properties.contentHashType());
-        request.insert(TP_QT_IFACE_CHANNEL_TYPE_FILE_TRANSFER + QLatin1String(".ContentHash"),
-                       properties.contentHash());
-    }
-
-    if (properties.hasDescription()) {
-        request.insert(TP_QT_IFACE_CHANNEL_TYPE_FILE_TRANSFER + QLatin1String(".Description"),
-                       properties.description());
-    }
-
-    if (properties.hasLastModificationTime()) {
-        request.insert(TP_QT_IFACE_CHANNEL_TYPE_FILE_TRANSFER + QLatin1String(".Date"),
-                       (qulonglong) properties.lastModificationTime().toTime_t());
-    }
-
-    if (properties.hasUri()) {
-        request.insert(TP_QT_IFACE_CHANNEL_TYPE_FILE_TRANSFER + QLatin1String(".URI"),
-                       properties.uri());
-    }
-
-    return request;
-}
-
-QVariantMap fileTransferRequest(const QString &contactIdentifier,
-        const Tp::FileTransferChannelCreationProperties &properties)
-{
-    QVariantMap request = fileTransferCommonRequest(properties);
-
-    if  (!request.isEmpty()) {
-        request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetID"),
-                       contactIdentifier);
-    }
-
-    return request;
-}
-
-QVariantMap fileTransferRequest(const Tp::ContactPtr &contact,
-        const Tp::FileTransferChannelCreationProperties &properties)
-{
-    QVariantMap request = fileTransferCommonRequest(properties);
-
-    if  (!request.isEmpty()) {
-        request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle"),
-                       contact ? contact->handle().at(0) : (uint) 0);
-    }
-
-    return request;
-}
-
-QVariantMap streamTubeCommonRequest(const QString &service)
-{
-    QVariantMap request;
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                   TP_QT_IFACE_CHANNEL_TYPE_STREAM_TUBE);
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
-                   (uint) Tp::HandleTypeContact);
-    request.insert(TP_QT_IFACE_CHANNEL_TYPE_STREAM_TUBE + QLatin1String(".Service"),
-                   service);
-    return request;
-}
-
-QVariantMap streamTubeRequest(const QString &contactIdentifier, const QString &service)
-{
-    QVariantMap request = streamTubeCommonRequest(service);
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetID"),
-                   contactIdentifier);
-    return request;
-}
-
-QVariantMap streamTubeRequest(const Tp::ContactPtr &contact, const QString &service)
-{
-    QVariantMap request = streamTubeCommonRequest(service);
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle"),
-                   contact ? contact->handle().at(0) : (uint) 0);
-    return request;
-}
-
-QVariantMap dbusTubeCommonRequest(const QString &serviceName)
-{
-    QVariantMap request;
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                   TP_QT_IFACE_CHANNEL_TYPE_DBUS_TUBE);
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
-                   (uint) Tp::HandleTypeContact);
-    request.insert(TP_QT_IFACE_CHANNEL_TYPE_DBUS_TUBE + QLatin1String(".ServiceName"),
-                   serviceName);
-    return request;
-}
-
-QVariantMap dbusTubeRequest(const QString &contactIdentifier, const QString &serviceName)
-{
-    QVariantMap request = dbusTubeCommonRequest(serviceName);
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetID"),
-                   contactIdentifier);
-    return request;
-}
-
-QVariantMap dbusTubeRequest(const Tp::ContactPtr &contact, const QString &serviceName)
-{
-    QVariantMap request = dbusTubeCommonRequest(serviceName);
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandle"),
-                   contact ? contact->handle().at(0) : (uint) 0);
-    return request;
-}
-
-QVariantMap conferenceCommonRequest(const QString &channelType, Tp::HandleType targetHandleType,
-        const QList<Tp::ChannelPtr> &channels)
-{
-    QVariantMap request;
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                   channelType);
-    if (targetHandleType != Tp::HandleTypeNone) {
-        request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"),
-                       (uint) targetHandleType);
-    }
-
-    Tp::ObjectPathList objectPaths;
-    foreach (const Tp::ChannelPtr &channel, channels) {
-        objectPaths << QDBusObjectPath(channel->objectPath());
-    }
-
-    request.insert(TP_QT_IFACE_CHANNEL_INTERFACE_CONFERENCE + QLatin1String(".InitialChannels"),
-            qVariantFromValue(objectPaths));
-    return request;
-}
-
-QVariantMap conferenceRequest(const QString &channelType, Tp::HandleType targetHandleType,
-        const QList<Tp::ChannelPtr> &channels, const QStringList &initialInviteeContactsIdentifiers)
-{
-    QVariantMap request = conferenceCommonRequest(channelType, targetHandleType, channels);
-    if (!initialInviteeContactsIdentifiers.isEmpty()) {
-        request.insert(TP_QT_IFACE_CHANNEL_INTERFACE_CONFERENCE + QLatin1String(".InitialInviteeIDs"),
-                initialInviteeContactsIdentifiers);
-    }
-    return request;
-}
-
-QVariantMap conferenceRequest(const QString &channelType, Tp::HandleType targetHandleType,
-        const QList<Tp::ChannelPtr> &channels, const QList<Tp::ContactPtr> &initialInviteeContacts)
-{
-    QVariantMap request = conferenceCommonRequest(channelType, targetHandleType, channels);
-    if (!initialInviteeContacts.isEmpty()) {
-        Tp::UIntList handles;
-        foreach (const Tp::ContactPtr &contact, initialInviteeContacts) {
-            if (!contact) {
-                continue;
-            }
-            handles << contact->handle()[0];
-        }
-        if (!handles.isEmpty()) {
-            request.insert(TP_QT_IFACE_CHANNEL_INTERFACE_CONFERENCE +
-                        QLatin1String(".InitialInviteeHandles"), qVariantFromValue(handles));
-        }
-    }
-    return request;
-}
-
-QVariantMap conferenceTextChatRequest(const QList<Tp::ChannelPtr> &channels,
-        const QStringList &initialInviteeContactsIdentifiers)
-{
-    QVariantMap request = conferenceRequest(TP_QT_IFACE_CHANNEL_TYPE_TEXT,
-            Tp::HandleTypeNone, channels, initialInviteeContactsIdentifiers);
-    return request;
-}
-
-QVariantMap conferenceTextChatRequest(const QList<Tp::ChannelPtr> &channels,
-        const QList<Tp::ContactPtr> &initialInviteeContacts)
-{
-    QVariantMap request = conferenceRequest(TP_QT_IFACE_CHANNEL_TYPE_TEXT,
-            Tp::HandleTypeNone, channels, initialInviteeContacts);
-    return request;
-}
-
-QVariantMap conferenceTextChatroomRequest(const QString &roomName,
-        const QList<Tp::ChannelPtr> &channels,
-        const QStringList &initialInviteeContactsIdentifiers)
-{
-    QVariantMap request = conferenceRequest(TP_QT_IFACE_CHANNEL_TYPE_TEXT,
-            Tp::HandleTypeRoom, channels, initialInviteeContactsIdentifiers);
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetID"), roomName);
-    return request;
-}
-
-QVariantMap conferenceTextChatroomRequest(const QString &roomName,
-        const QList<Tp::ChannelPtr> &channels,
-        const QList<Tp::ContactPtr> &initialInviteeContacts)
-{
-    QVariantMap request = conferenceRequest(TP_QT_IFACE_CHANNEL_TYPE_TEXT,
-            Tp::HandleTypeRoom, channels, initialInviteeContacts);
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetID"), roomName);
-    return request;
-}
-
-QVariantMap conferenceStreamedMediaCallRequest(const QList<Tp::ChannelPtr> &channels,
-        const QStringList &initialInviteeContactsIdentifiers)
-{
-    QVariantMap request = conferenceRequest(TP_QT_IFACE_CHANNEL_TYPE_STREAMED_MEDIA,
-            Tp::HandleTypeNone, channels, initialInviteeContactsIdentifiers);
-    return request;
-}
-
-QVariantMap conferenceStreamedMediaCallRequest(const QList<Tp::ChannelPtr> &channels,
-        const QList<Tp::ContactPtr> &initialInviteeContacts)
-{
-    QVariantMap request = conferenceRequest(TP_QT_IFACE_CHANNEL_TYPE_STREAMED_MEDIA,
-            Tp::HandleTypeNone, channels, initialInviteeContacts);
-    return request;
-}
-
-QVariantMap contactSearchRequest(const ConnectionCapabilities &capabilities,
-        const QString &server, uint limit)
-{
-    QVariantMap request;
-    request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"),
-                   TP_QT_IFACE_CHANNEL_TYPE_CONTACT_SEARCH);
-    if (capabilities.contactSearchesWithSpecificServer()) {
-        request.insert(TP_QT_IFACE_CHANNEL_TYPE_CONTACT_SEARCH + QLatin1String(".Server"),
-                       server);
-    } else if (!server.isEmpty()) {
-        warning() << "Ignoring Server parameter for contact search, since the protocol does not support it.";
-    }
-    if (capabilities.contactSearchesWithLimit()) {
-        request.insert(TP_QT_IFACE_CHANNEL_TYPE_CONTACT_SEARCH + QLatin1String(".Limit"), limit);
-    } else if (limit > 0) {
-        warning() << "Ignoring Limit parameter for contact search, since the protocol does not support it.";
-    }
-    return request;
-}
-
-} // anonymous namespace
-
-struct TP_QT_NO_EXPORT Account::Private
-{
-    Private(Account *parent, const ConnectionFactoryConstPtr &connFactory,
-            const ChannelFactoryConstPtr &chanFactory,
-            const ContactFactoryConstPtr &contactFactory);
-    ~Private();
-
-    void init();
-
-    static void introspectMain(Private *self);
-    static void introspectAvatar(Private *self);
-    static void introspectProtocolInfo(Private *self);
-    static void introspectCapabilities(Private *self);
-
-    void updateProperties(const QVariantMap &props);
-    void retrieveAvatar();
-    bool processConnQueue();
-
-    bool checkCapabilitiesChanged(bool profileChanged);
-
-    QString connectionObjectPath() const;
-
-    // Public object
-    Account *parent;
-
-    // Factories
-    ConnectionFactoryConstPtr connFactory;
-    ChannelFactoryConstPtr chanFactory;
-    ContactFactoryConstPtr contactFactory;
-
-    // Instance of generated interface class
-    Client::AccountInterface *baseInterface;
-
-    // Mandatory properties interface proxy
-    Client::DBus::PropertiesInterface *properties;
-
-    ReadinessHelper *readinessHelper;
-
-    // Introspection
-    QVariantMap parameters;
-    bool valid;
-    bool enabled;
-    bool connectsAutomatically;
-    bool hasBeenOnline;
-    bool changingPresence;
-    QString cmName;
-    QString protocolName;
-    QString serviceName;
-    ProfilePtr profile;
-    QString displayName;
-    QString nickname;
-    QString iconName;
-    QQueue<QString> connObjPathQueue;
-    ConnectionPtr connection;
-    bool mayFinishCore, coreFinished;
-    QString normalizedName;
-    Avatar avatar;
-    ConnectionManagerPtr cm;
-    ConnectionStatus connectionStatus;
-    ConnectionStatusReason connectionStatusReason;
-    QString connectionError;
-    Connection::ErrorDetails connectionErrorDetails;
-    Presence automaticPresence;
-    Presence currentPresence;
-    Presence requestedPresence;
-    bool usingConnectionCaps;
-    ConnectionCapabilities customCaps;
-
-    // The contexts should never be removed from the map, to guarantee O(1) CD introspections per bus
-    struct DispatcherContext;
-    static QHash<QString, QSharedPointer<DispatcherContext> > dispatcherContexts;
-    QSharedPointer<DispatcherContext> dispatcherContext;
-};
-
-struct Account::Private::DispatcherContext
-{
-    DispatcherContext(const QDBusConnection &bus)
-        : iface(new Client::ChannelDispatcherInterface(bus, TP_QT_CHANNEL_DISPATCHER_BUS_NAME, TP_QT_CHANNEL_DISPATCHER_OBJECT_PATH)),
-          introspected(false), supportsHints(false)
-    {
-    }
-
-    ~DispatcherContext()
-    {
-        delete iface;
-    }
-
-    Client::ChannelDispatcherInterface *iface;
-
-    bool introspected, supportsHints;
-    QWeakPointer<PendingVariant> introspectOp;
-
-private:
-    DispatcherContext(const DispatcherContext &);
-    void operator=(const DispatcherContext &);
-};
-
-Account::Private::Private(Account *parent, const ConnectionFactoryConstPtr &connFactory,
-        const ChannelFactoryConstPtr &chanFactory, const ContactFactoryConstPtr &contactFactory)
-    : parent(parent),
-      connFactory(connFactory),
-      chanFactory(chanFactory),
-      contactFactory(contactFactory),
-      baseInterface(new Client::AccountInterface(parent)),
-      properties(parent->interface<Client::DBus::PropertiesInterface>()),
-      readinessHelper(parent->readinessHelper()),
-      valid(false),
-      enabled(false),
-      connectsAutomatically(false),
-      hasBeenOnline(false),
-      changingPresence(false),
-      mayFinishCore(false),
-      coreFinished(false),
-      connectionStatus(ConnectionStatusDisconnected),
-      connectionStatusReason(ConnectionStatusReasonNoneSpecified),
-      usingConnectionCaps(false),
-      dispatcherContext(dispatcherContexts.value(parent->dbusConnection().name()))
-{
-    // FIXME: QRegExp probably isn't the most efficient possible way to parse
-    //        this :-)
-    QRegExp rx(QLatin1String("^") + TP_QT_ACCOUNT_OBJECT_PATH_BASE +
-                QLatin1String("/([_A-Za-z][_A-Za-z0-9]*)"  // cap(1) is the CM
-                "/([_A-Za-z][_A-Za-z0-9]*)"  // cap(2) is the protocol
-                "/([_A-Za-z][_A-Za-z0-9]*)"  // account-specific part
-                ));
-
-    if (rx.exactMatch(parent->objectPath())) {
-        cmName = rx.cap(1);
-        protocolName = rx.cap(2).replace(QLatin1Char('_'), QLatin1Char('-'));
-    } else {
-        warning() << "Account object path is not spec-compliant, "
-            "trying again with a different account-specific part check";
-
-        rx = QRegExp(QLatin1String("^") + TP_QT_ACCOUNT_OBJECT_PATH_BASE +
-                    QLatin1String("/([_A-Za-z][_A-Za-z0-9]*)"  // cap(1) is the CM
-                    "/([_A-Za-z][_A-Za-z0-9]*)"  // cap(2) is the protocol
-                    "/([_A-Za-z0-9]*)"  // account-specific part
-                    ));
-        if (rx.exactMatch(parent->objectPath())) {
-            cmName = rx.cap(1);
-            protocolName = rx.cap(2).replace(QLatin1Char('_'), QLatin1Char('-'));
-        } else {
-            warning() << "Not a valid Account object path:" <<
-                parent->objectPath();
-        }
-    }
-
-    ReadinessHelper::Introspectables introspectables;
-
-    // As Account does not have predefined statuses let's simulate one (0)
-    ReadinessHelper::Introspectable introspectableCore(
-        QSet<uint>() << 0,                                                      // makesSenseForStatuses
-        Features(),                                                             // dependsOnFeatures
-        QStringList(),                                                          // dependsOnInterfaces
-        (ReadinessHelper::IntrospectFunc) &Private::introspectMain,
-        this);
-    introspectables[FeatureCore] = introspectableCore;
-
-    ReadinessHelper::Introspectable introspectableAvatar(
-        QSet<uint>() << 0,                                                            // makesSenseForStatuses
-        Features() << FeatureCore,                                                    // dependsOnFeatures (core)
-        QStringList() << TP_QT_IFACE_ACCOUNT_INTERFACE_AVATAR, // dependsOnInterfaces
-        (ReadinessHelper::IntrospectFunc) &Private::introspectAvatar,
-        this);
-    introspectables[FeatureAvatar] = introspectableAvatar;
-
-    ReadinessHelper::Introspectable introspectableProtocolInfo(
-        QSet<uint>() << 0,                                                      // makesSenseForStatuses
-        Features() << FeatureCore,                                              // dependsOnFeatures (core)
-        QStringList(),                                                          // dependsOnInterfaces
-        (ReadinessHelper::IntrospectFunc) &Private::introspectProtocolInfo,
-        this);
-    introspectables[FeatureProtocolInfo] = introspectableProtocolInfo;
-
-    ReadinessHelper::Introspectable introspectableCapabilities(
-        QSet<uint>() << 0,                                                      // makesSenseForStatuses
-        Features() << FeatureCore << FeatureProtocolInfo << FeatureProfile,     // dependsOnFeatures
-        QStringList(),                                                          // dependsOnInterfaces
-        (ReadinessHelper::IntrospectFunc) &Private::introspectCapabilities,
-        this);
-    introspectables[FeatureCapabilities] = introspectableCapabilities;
-
-    readinessHelper->addIntrospectables(introspectables);
-
-    if (connFactory->dbusConnection().name() != parent->dbusConnection().name()) {
-        warning() << "  The D-Bus connection in the conn factory is not the proxy connection for"
-            << parent->objectPath();
-    }
-
-    if (chanFactory->dbusConnection().name() != parent->dbusConnection().name()) {
-        warning() << "  The D-Bus connection in the channel factory is not the proxy connection for"
-            << parent->objectPath();
-    }
-
-    if (!dispatcherContext) {
-        dispatcherContext = QSharedPointer<DispatcherContext>(new DispatcherContext(parent->dbusConnection()));
-        dispatcherContexts.insert(parent->dbusConnection().name(), dispatcherContext);
-    }
-
-    init();
-}
-
-Account::Private::~Private()
-{
-}
-
-bool Account::Private::checkCapabilitiesChanged(bool profileChanged)
-{
-    /* when the capabilities changed:
-     *
-     * - We were using the connection caps and now we don't have connection or
-     *   the connection we have is not connected (changed to CM caps)
-     * - We were using the CM caps and now we have a connected connection
-     *   (changed to new connection caps)
-     */
-    bool changed = false;
-
-    if (usingConnectionCaps &&
-        (parent->connection().isNull() ||
-         connection->status() != ConnectionStatusConnected)) {
-        usingConnectionCaps = false;
-        changed = true;
-    } else if (!usingConnectionCaps &&
-        !parent->connection().isNull() &&
-        connection->status() == ConnectionStatusConnected) {
-        usingConnectionCaps = true;
-        changed = true;
-    } else if (!usingConnectionCaps && profileChanged) {
-        changed = true;
-    }
-
-    if (changed && parent->isReady(FeatureCapabilities)) {
-        emit parent->capabilitiesChanged(parent->capabilities());
-    }
-
-    return changed;
-}
-
-QString Account::Private::connectionObjectPath() const
-{
-    return !connection.isNull() ? connection->objectPath() : QString();
-}
-
-QHash<QString, QSharedPointer<Account::Private::DispatcherContext> > Account::Private::dispatcherContexts;
-
-/**
- * \class Account
- * \ingroup clientaccount
- * \headerfile TelepathyQt/account.h <TelepathyQt/Account>
- *
- * \brief The Account class represents a Telepathy account.
- *
- * The remote object accessor functions on this object (isValidAccount(),
- * isEnabled(), and so on) don't make any D-Bus calls; instead, they return/use
- * values cached from a previous introspection run. The introspection process
- * populates their values in the most efficient way possible based on what the
- * service implements.
- *
- * To avoid unnecessary D-Bus traffic, some accessors only return valid
- * information after specific features have been enabled.
- * For instance, to retrieve the account protocol information, it is necessary to
- * enable the feature Account::FeatureProtocolInfo.
- * See the individual methods descriptions for more details.
- *
- * Account features can be enabled by constructing an AccountFactory and enabling
- * the desired features, and passing it to AccountManager or ClientRegistrar
- * when creating them as appropriate. However, if a particular
- * feature is only ever used in a specific circumstance, such as an user opening
- * some settings dialog separate from the general view of the application,
- * features can be later enabled as needed by calling becomeReady() with the additional
- * features, and waiting for the resulting PendingOperation to finish.
- *
- * As an addition to accessors, signals are emitted to indicate that properties have
- * changed, for example displayNameChanged(), iconNameChanged(), etc.
- *
- * Convenience methods to create channels using the channel dispatcher such as
- * ensureTextChat(), createFileTransfer() are also provided.
- *
- * If the account is deleted from the AccountManager, this object
- * will not be deleted automatically; however, it will emit invalidated()
- * with error code #TP_QT_ERROR_OBJECT_REMOVED and will cease to
- * be useful.
- *
- * \section account_usage_sec Usage
- *
- * \subsection account_create_sec Creating an account object
- *
- * The easiest way to create account objects is through AccountManager. One can
- * just use the AccountManager convenience methods such as
- * AccountManager::validAccounts() to get a list of account objects representing
- * valid accounts.
- *
- * If you already know the object path, you can just call create().
- * For example:
- *
- * \code AccountPtr acc = Account::create(busName, objectPath); \endcode
- *
- * An AccountPtr object is returned, which will automatically keep
- * track of object lifetime.
- *
- * You can also provide a D-Bus connection as a QDBusConnection:
- *
- * \code
- *
- * AccountPtr acc = Account::create(QDBusConnection::sessionBus(),
- *         busName, objectPath);
- *
- * \endcode
- *
- * \subsection account_ready_sec Making account ready to use
- *
- * An Account object needs to become ready before usage, meaning that the
- * introspection process finished and the object accessors can be used.
- *
- * To make the object ready, use becomeReady() and wait for the
- * PendingOperation::finished() signal to be emitted.
- *
- * \code
- *
- * class MyClass : public QObject
- * {
- *     QOBJECT
- *
- * public:
- *     MyClass(QObject *parent = 0);
- *     ~MyClass() { }
- *
- * private Q_SLOTS:
- *     void onAccountReady(Tp::PendingOperation*);
- *
- * private:
- *     AccountPtr acc;
- * };
- *
- * MyClass::MyClass(const QString &busName, const QString &objectPath,
- *         QObject *parent)
- *     : QObject(parent)
- *       acc(Account::create(busName, objectPath))
- * {
- *     connect(acc->becomeReady(),
- *             SIGNAL(finished(Tp::PendingOperation*)),
- *             SLOT(onAccountReady(Tp::PendingOperation*)));
- * }
- *
- * void MyClass::onAccountReady(Tp::PendingOperation *op)
- * {
- *     if (op->isError()) {
- *         qWarning() << "Account cannot become ready:" <<
- *             op->errorName() << "-" << op->errorMessage();
- *         return;
- *     }
- *
- *     // Account is now ready
- *     qDebug() << "Display name:" << acc->displayName();
- * }
- *
- * \endcode
- *
- * See \ref async_model, \ref shared_ptr
- */
-
-/**
- * Feature representing the core that needs to become ready to make the Account
- * object usable.
- *
- * Note that this feature must be enabled in order to use most Account methods.
- * See specific methods documentation for more details.
- *
- * When calling isReady(), becomeReady(), this feature is implicitly added
- * to the requested features.
- */
-const Feature Account::FeatureCore = Feature(QLatin1String(Account::staticMetaObject.className()), 0, true);
-
-/**
- * Feature used in order to access account avatar info.
- *
- * See avatar specific methods' documentation for more details.
- *
- * \sa avatar(), avatarChanged()
- */
-const Feature Account::FeatureAvatar = Feature(QLatin1String(Account::staticMetaObject.className()), 1);
-
-/**
- * Feature used in order to access account protocol info.
- *
- * See protocol info specific methods' documentation for more details.
- *
- * \sa protocolInfo()
- */
-const Feature Account::FeatureProtocolInfo = Feature(QLatin1String(Account::staticMetaObject.className()), 2);
-
-/**
- * Feature used in order to access account capabilities.
- *
- * Enabling this feature will also enable FeatureProtocolInfo and FeatureProfile.
- *
- * See capabilities specific methods' documentation for more details.
- *
- * \sa capabilities(), capabilitiesChanged()
- */
-const Feature Account::FeatureCapabilities = Feature(QLatin1String(Account::staticMetaObject.className()), 3);
-
-/**
- * Feature used in order to access account profile info.
- *
- * See profile specific methods' documentation for more details.
- *
- * \sa profile(), profileChanged()
- */
-const Feature Account::FeatureProfile = FeatureProtocolInfo;
-// FeatureProfile is the same as FeatureProtocolInfo for now, as it only needs
-// the protocol info, cm name and protocol name to build a fake profile. Make it
-// a full-featured feature if needed later.
-
-/**
- * Create a new Account object using QDBusConnection::sessionBus() and the given factories.
- *
- * A warning is printed if the factories are not for QDBusConnection::sessionBus().
- *
- * \param busName The account well-known bus name (sometimes called a "service
- *                name"). This is usually the same as the account manager
- *                bus name #TP_QT_ACCOUNT_MANAGER_BUS_NAME.
- * \param objectPath The account object path.
- * \param connectionFactory The connection factory to use.
- * \param channelFactory The channel factory to use.
- * \param contactFactory The contact factory to use.
- * \return An AccountPtr object pointing to the newly created Account object.
- */
-AccountPtr Account::create(const QString &busName, const QString &objectPath,
-        const ConnectionFactoryConstPtr &connectionFactory,
-        const ChannelFactoryConstPtr &channelFactory,
-        const ContactFactoryConstPtr &contactFactory)
-{
-    return AccountPtr(new Account(QDBusConnection::sessionBus(), busName, objectPath,
-                connectionFactory, channelFactory, contactFactory, Account::FeatureCore));
-}
-
-/**
- * Create a new Account object using the given \a bus and the given factories.
- *
- * A warning is printed if the factories are not for \a bus.
- *
- * \param bus QDBusConnection to use.
- * \param busName The account well-known bus name (sometimes called a "service
- *                name"). This is usually the same as the account manager
- *                bus name #TP_QT_ACCOUNT_MANAGER_BUS_NAME.
- * \param objectPath The account object path.
- * \param connectionFactory The connection factory to use.
- * \param channelFactory The channel factory to use.
- * \param contactFactory The contact factory to use.
- * \return An AccountPtr object pointing to the newly created Account object.
- */
-AccountPtr Account::create(const QDBusConnection &bus,
-        const QString &busName, const QString &objectPath,
-        const ConnectionFactoryConstPtr &connectionFactory,
-        const ChannelFactoryConstPtr &channelFactory,
-        const ContactFactoryConstPtr &contactFactory)
-{
-    return AccountPtr(new Account(bus, busName, objectPath, connectionFactory, channelFactory,
-                contactFactory, Account::FeatureCore));
-}
-
-/**
- * Construct a new Account object using the given \a bus and the given factories.
- *
- * A warning is printed if the factories are not for \a bus.
- *
- * \param bus QDBusConnection to use.
- * \param busName The account well-known bus name (sometimes called a "service
- *                name"). This is usually the same as the account manager
- *                bus name #TP_QT_ACCOUNT_MANAGER_BUS_NAME.
- * \param objectPath The account object path.
- * \param connectionFactory The connection factory to use.
- * \param channelFactory The channel factory to use.
- * \param contactFactory The contact factory to use.
- * \param coreFeature The core feature of the Account subclass. The corresponding introspectable
- * should depend on Account::FeatureCore.
- */
-Account::Account(const QDBusConnection &bus,
-        const QString &busName, const QString &objectPath,
-        const ConnectionFactoryConstPtr &connectionFactory,
-        const ChannelFactoryConstPtr &channelFactory,
-        const ContactFactoryConstPtr &contactFactory,
-        const Feature &coreFeature)
-    : StatelessDBusProxy(bus, busName, objectPath, coreFeature),
-      OptionalInterfaceFactory<Account>(this),
-      mPriv(new Private(this, connectionFactory, channelFactory, contactFactory))
-{
-}
-
-/**
- * Class destructor.
- */
-Account::~Account()
-{
-    delete mPriv;
-}
-
-/**
- * Return the connection factory used by this account.
- *
- * Only read access is provided. This allows constructing object instances and examining the object
- * construction settings, but not changing settings. Allowing changes would lead to tricky
- * situations where objects constructed at different times by the account would have unpredictably
- * different construction settings (eg. subclass).
- *
- * \return A read-only pointer to the ConnectionFactory object.
- */
-ConnectionFactoryConstPtr Account::connectionFactory() const
-{
-    return mPriv->connFactory;
-}
-
-/**
- * Return the channel factory used by this account.
- *
- * Only read access is provided. This allows constructing object instances and examining the object
- * construction settings, but not changing settings. Allowing changes would lead to tricky
- * situations where objects constructed at different times by the account would have unpredictably
- * different construction settings (eg. subclass).
- *
- * \return A read-only pointer to the ChannelFactory object.
- */
-ChannelFactoryConstPtr Account::channelFactory() const
-{
-    return mPriv->chanFactory;
-}
-
-/**
- * Return the contact factory used by this account.
- *
- * Only read access is provided. This allows constructing object instances and examining the object
- * construction settings, but not changing settings. Allowing changes would lead to tricky
- * situations where objects constructed at different times by the account would have unpredictably
- * different construction settings (eg. subclass).
- *
- * \return A read-only pointer to the ContactFactory object.
- */
-ContactFactoryConstPtr Account::contactFactory() const
-{
-    return mPriv->contactFactory;
-}
-
-/**
- * Return whether this account is valid.
- *
- * If \c true, this account is considered by the account manager to be complete
- * and usable. If \c false, user action is required to make it usable, and it will
- * never attempt to connect. For instance, this might be caused by the absence
- * or misconfiguration of a required parameter, in which case updateParameters()
- * may be used to properly set the parameters values.
- *
- * Change notification is via the validityChanged() signal.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return \c true if valid, \c false otherwise.
- * \sa validityChanged(), updateParameters()
- */
-bool Account::isValidAccount() const
-{
-    return mPriv->valid;
-}
-
-/**
- * Return whether this account is enabled.
- *
- * Change notification is via the stateChanged() signal.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return \c true if enabled, \c false otherwise.
- * \sa stateChanged(), setEnabled()
- */
-bool Account::isEnabled() const
-{
-    return mPriv->enabled;
-}
-
-/**
- * Set whether this account should be enabled or disabled.
- *
- * This gives users the possibility to prevent an account from
- * being used.
- *
- * Note that changing this property won't change the validity of the account.
- *
- * \param value Whether this account should be enabled or disabled.
- * \return A PendingOperation which will emit PendingOperation::finished
- *         when the request has been made.
- * \sa stateChanged(), isEnabled()
- */
-PendingOperation *Account::setEnabled(bool value)
-{
-    return new PendingVoid(
-            mPriv->properties->Set(
-                TP_QT_IFACE_ACCOUNT,
-                QLatin1String("Enabled"),
-                QDBusVariant(value)),
-            AccountPtr(this));
-}
-
-/**
- * Return the connection manager name of this account.
- *
- * \return The connection manager name.
- */
-QString Account::cmName() const
-{
-    return mPriv->cmName;
-}
-
-/**
- * Return the protocol name of this account.
- *
- * \return The protocol name.
- */
-QString Account::protocolName() const
-{
-    return mPriv->protocolName;
-}
-
-/**
- * Return the service name of this account.
- *
- * Note that this method will fallback to protocolName() if service name
- * is not known.
- *
- * Change notification is via the serviceNameChanged() signal.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return The service name.
- * \sa serviceNameChanged(), setServiceName(), protocolName()
- */
-QString Account::serviceName() const
-{
-    if (mPriv->serviceName.isEmpty()) {
-        return mPriv->protocolName;
-    }
-    return mPriv->serviceName;
-}
-
-/**
- * Set the service name of this account.
- *
- * Some protocols, like XMPP and SIP, are used by various different user-recognised brands,
- * such as Google Talk. On accounts for such services, this method can be used
- * to set the name describing the service, which must consist only of ASCII letters, numbers and
- * hyphen/minus signs, and start with a letter.
- * For the jabber protocol, one of the following service names should be used if possible:
- *
- *   google-talk (for Google's IM service)
- *   facebook (for Facebook's IM service)
- *   lj-talk (for LiveJournal's IM service)
- *
- * The service name may also be set, if appropriate, when creating the account. See
- * AccountManager::createAccount() for more details.
- *
- * Note that changing this property may also change the profile() used by this account,
- * in which case profileChanged() will be emitted in addition to serviceNameChanged(), if
- * Account::FeatureProfile is enabled.
- *
- * \param value The service name of this account.
- * \return A PendingOperation which will emit PendingOperation::finished
- *         when the request has been made.
- * \sa serviceNameChanged(), serviceName()
- */
-PendingOperation *Account::setServiceName(const QString &value)
-{
-    return new PendingVoid(
-            mPriv->properties->Set(
-                TP_QT_IFACE_ACCOUNT,
-                QLatin1String("Service"),
-                QDBusVariant(value)),
-            AccountPtr(this));
-}
-
-/**
- * Return the profile used by this account.
- *
- * Profiles are intended to describe variants of the basic protocols supported by Telepathy
- * connection managers.
- * An example of this would be Google Talk vs Facebook chat vs Jabber/XMPP. Google Talk is a
- * specific case of XMPP with well-known capabilities, quirks and settings, and Facebook chat is
- * a subset of the standard XMPP offering.
- *
- * This method will return the profile for this account based on the service used by it.
- *
- * Note that if a profile for serviceName() is not available, a fake profile
- * (Profile::isFake() is \c true) will be returned in case protocolInfo() is valid.
- *
- * The fake profile will contain the following info:
- *  - Profile::type() will return "IM"
- *  - Profile::provider() will return an empty string
- *  - Profile::serviceName() will return "cmName()-serviceName()"
- *  - Profile::name() and Profile::protocolName() will return protocolName()
- *  - Profile::iconName() will return "im-protocolName()"
- *  - Profile::cmName() will return cmName()
- *  - Profile::parameters() will return a list matching CM default parameters for protocol with name
- *    protocolName()
- *  - Profile::presences() will return an empty list and
- *    Profile::allowOtherPresences() will return \c true, meaning that CM
- *    presences should be used
- *  - Profile::unsupportedChannelClassSpecs() will return an empty list
- *
- * Change notification is via the profileChanged() signal.
- *
- * This method requires Account::FeatureProfile to be ready.
- *
- * \return A pointer to the Profile object.
- * \sa profileChanged(), serviceName()
- */
-ProfilePtr Account::profile() const
-{
-    if (!isReady(FeatureProfile)) {
-        warning() << "Account::profile() requires Account::FeatureProfile to be ready";
-        return ProfilePtr();
-    }
-
-    if (!mPriv->profile) {
-        mPriv->profile = Profile::createForServiceName(serviceName());
-        if (!mPriv->profile->isValid()) {
-            if (protocolInfo().isValid()) {
-                mPriv->profile = ProfilePtr(new Profile(
-                            QString(QLatin1String("%1-%2")).arg(mPriv->cmName).arg(serviceName()),
-                            mPriv->cmName,
-                            mPriv->protocolName,
-                            protocolInfo()));
-            } else {
-                warning() << "Cannot create profile as neither a .profile is installed for service" <<
-                    serviceName() << "nor protocol info can be retrieved";
-            }
-        }
-    }
-    return mPriv->profile;
-}
-
-/**
- * Return the display name of this account.
- *
- * Change notification is via the displayNameChanged() signal.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return The display name.
- * \sa displayNameChanged(), setDisplayName()
- */
-QString Account::displayName() const
-{
-    return mPriv->displayName;
-}
-
-/**
- * Set the display name of this account.
- *
- * The display name is the user-visible name of this account.
- * This is usually chosen by the user at account creation time.
- * See AccountManager::createAccount() for more details.
- *
- * \param value The display name of this account.
- * \return A PendingOperation which will emit PendingOperation::finished
- *         when the request has been made.
- * \sa displayNameChanged(), displayName()
- */
-PendingOperation *Account::setDisplayName(const QString &value)
-{
-    return new PendingVoid(
-            mPriv->properties->Set(
-                TP_QT_IFACE_ACCOUNT,
-                QLatin1String("DisplayName"),
-                QDBusVariant(value)),
-            AccountPtr(this));
-}
-
-/**
- * Return the icon name of this account.
- *
- * If the account has no icon, and Account::FeatureProfile is enabled, the icon from the result of
- * profile() will be used.
- *
- * If neither the account nor the profile has an icon, and Account::FeatureProtocolInfo is
- * enabled, the icon from protocolInfo() will be used if set.
- *
- * As a last resort, "im-" + protocolName() will be returned.
- *
- * This matches the fallbacks recommended by the \telepathy_spec.
- *
- * Change notification is via the iconNameChanged() signal.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return The icon name.
- * \sa iconNameChanged(), setIconName()
- */
-QString Account::iconName() const
-{
-    if (mPriv->iconName.isEmpty()) {
-        if (isReady(FeatureProfile)) {
-            ProfilePtr pr = profile();
-            if (pr && pr->isValid()) {
-                QString iconName = pr->iconName();
-                if (!iconName.isEmpty()) {
-                    return iconName;
-                }
-            }
-        }
-
-        if (isReady(FeatureProtocolInfo) && protocolInfo().isValid()) {
-            return protocolInfo().iconName();
-        }
-
-        return QString(QLatin1String("im-%1")).arg(protocolName());
-    }
-
-    return mPriv->iconName;
-}
-
-/**
- * Set the icon name of this account.
- *
- * \param value The icon name of this account.
- * \return A PendingOperation which will emit PendingOperation::finished
- *         when the request has been made.
- * \sa iconNameChanged(), iconName()
- */
-PendingOperation *Account::setIconName(const QString &value)
-{
-    return new PendingVoid(
-            mPriv->properties->Set(
-                TP_QT_IFACE_ACCOUNT,
-                QLatin1String("Icon"),
-                QDBusVariant(value)),
-            AccountPtr(this));
-}
-
-/**
- * Return the nickname of this account.
- *
- * Change notification is via the nicknameChanged() signal.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return The nickname.
- * \sa nicknameChanged(), setNickname()
- */
-QString Account::nickname() const
-{
-    return mPriv->nickname;
-}
-
-/**
- * Set the nickname of this account as seen to other contacts.
- *
- * \param value The nickname of this account.
- * \return A PendingOperation which will emit PendingOperation::finished
- *         when the request has been made.
- * \sa nicknameChanged(), nickname()
- */
-PendingOperation *Account::setNickname(const QString &value)
-{
-    return new PendingVoid(
-            mPriv->properties->Set(
-                TP_QT_IFACE_ACCOUNT,
-                QLatin1String("Nickname"),
-                QDBusVariant(value)),
-            AccountPtr(this));
-}
-
-/**
- * Return the avatar requirements (size limits, supported MIME types, etc)
- * for avatars passed to setAvatar() on this account.
- *
- * For now this method will only return the avatar requirements found in protocolInfo() if
- * Account::FeatureProtocolInfo is ready, otherwise an invalid AvatarSpec instance is returned.
- *
- * \return The requirements as an AvatarSpec object.
- * \sa avatar(), setAvatar()
- */
-AvatarSpec Account::avatarRequirements() const
-{
-    // TODO Once connection has support for avatar requirements use it if the connection is usable
-    ProtocolInfo pi = protocolInfo();
-    if (pi.isValid()) {
-        return pi.avatarRequirements();
-    }
-    return AvatarSpec();
-}
-
-/**
- * Return the avatar of this account.
- *
- * Change notification is via the avatarChanged() signal.
- *
- * This method requires Account::FeatureAvatar to be ready.
- *
- * \return The avatar as an Avatar object.
- * \sa avatarChanged(), setAvatar()
- */
-const Avatar &Account::avatar() const
-{
-    if (!isReady(Features() << FeatureAvatar)) {
-        warning() << "Trying to retrieve avatar from account, but "
-                     "avatar is not supported or was not requested. "
-                     "Use becomeReady(FeatureAvatar)";
-    }
-
-    return mPriv->avatar;
-}
-
-/**
- * Set avatar of this account as seen to other contacts.
- *
- * Note that \a avatar must match the requirements as returned by avatarRequirements().
- *
- * \param avatar The avatar of this account.
- * \return A PendingOperation which will emit PendingOperation::finished
- *         when the request has been made.
- * \sa avatarChanged(), avatar(), avatarRequirements()
- */
-PendingOperation *Account::setAvatar(const Avatar &avatar)
-{
-    if (!interfaces().contains(TP_QT_IFACE_ACCOUNT_INTERFACE_AVATAR)) {
-        return new PendingFailure(
-                TP_QT_ERROR_NOT_IMPLEMENTED,
-                QLatin1String("Account does not support Avatar"),
-                AccountPtr(this));
-    }
-
-    return new PendingVoid(
-            mPriv->properties->Set(
-                TP_QT_IFACE_ACCOUNT_INTERFACE_AVATAR,
-                QLatin1String("Avatar"),
-                QDBusVariant(QVariant::fromValue(avatar))),
-            AccountPtr(this));
-}
-
-/**
- * Return the parameters of this account.
- *
- * The account parameters are represented as a map from connection manager parameter names
- * to their values.
- *
- * Change notification is via the parametersChanged() signal.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return The parameters as QVariantMap.
- * \sa parametersChanged(), updateParameters()
- */
-QVariantMap Account::parameters() const
-{
-    return mPriv->parameters;
-}
-
-/**
- * Update this account parameters.
- *
- * On success, the PendingOperation returned by this method will produce a
- * list of strings, which are the names of parameters whose changes will not
- * take effect until the account is disconnected and reconnected (for instance
- * by calling reconnect()).
- *
- * \param set Parameters to set.
- * \param unset Parameters to unset.
- * \return A PendingStringList which will emit PendingStringList::finished
- *         when the request has been made
- * \sa parametersChanged(), parameters(), reconnect()
- */
-PendingStringList *Account::updateParameters(const QVariantMap &set,
-        const QStringList &unset)
-{
-    return new PendingStringList(
-            baseInterface()->UpdateParameters(set, unset),
-            AccountPtr(this));
-}
-
-/**
- * Return the protocol info of this account protocol.
- *
- * This method requires Account::FeatureProtocolInfo to be ready.
- *
- * \return The protocol info as a ProtocolInfo object.
- */
-ProtocolInfo Account::protocolInfo() const
-{
-    if (!isReady(Features() << FeatureProtocolInfo)) {
-        warning() << "Trying to retrieve protocol info from account, but "
-                     "protocol info is not supported or was not requested. "
-                     "Use becomeReady(FeatureProtocolInfo)";
-        return ProtocolInfo();
-    }
-
-    return mPriv->cm->protocol(mPriv->protocolName);
-}
-
-/**
- * Return the capabilities for this account.
- *
- * Note that this method will return the connection() capabilities if the
- * account is online and ready. If the account is disconnected, it will fallback
- * to return the subtraction of the protocolInfo() capabilities and the profile() unsupported
- * capabilities.
- *
- * Change notification is via the capabilitiesChanged() signal.
- *
- * This method requires Account::FeatureCapabilities to be ready.
- *
- * \return The capabilities as a ConnectionCapabilities object.
- * \sa capabilitiesChanged(), protocolInfo(), profile()
- */
-ConnectionCapabilities Account::capabilities() const
-{
-    if (!isReady(FeatureCapabilities)) {
-        warning() << "Trying to retrieve capabilities from account, but "
-                     "FeatureCapabilities was not requested. "
-                     "Use becomeReady(FeatureCapabilities)";
-        return ConnectionCapabilities();
-    }
-
-    // if the connection is online and ready use its caps
-    if (mPriv->connection &&
-        mPriv->connection->status() == ConnectionStatusConnected) {
-        return mPriv->connection->capabilities();
-    }
-
-    // if we are here it means FeatureProtocolInfo and FeatureProfile are ready, as
-    // FeatureCapabilities depend on them, so let's use the subtraction of protocol info caps rccs
-    // and profile unsupported rccs.
-    //
-    // However, if we failed to introspect the CM (eg. this is a test), then let's not try to use
-    // the protocolInfo because it'll be NULL! Profile may also be NULL in case a .profile for
-    // serviceName() is not present and protocolInfo is NULL.
-    ProtocolInfo pi = protocolInfo();
-    if (!pi.isValid()) {
-        return ConnectionCapabilities();
-    }
-    ProfilePtr pr;
-    if (isReady(FeatureProfile)) {
-        pr = profile();
-    }
-    if (!pr || !pr->isValid()) {
-        return pi.capabilities();
-    }
-
-    RequestableChannelClassSpecList piClassSpecs = pi.capabilities().allClassSpecs();
-    RequestableChannelClassSpecList prUnsupportedClassSpecs = pr->unsupportedChannelClassSpecs();
-    RequestableChannelClassSpecList classSpecs;
-    bool unsupported;
-    foreach (const RequestableChannelClassSpec &piClassSpec, piClassSpecs) {
-        unsupported = false;
-        foreach (const RequestableChannelClassSpec &prUnsuportedClassSpec, prUnsupportedClassSpecs) {
-            // Here we check the following:
-            // - If the unsupported spec has no allowed property it means it does not support any
-            // class whose fixed properties match.
-            //   E.g: Doesn't support any media calls, be it audio or video.
-            // - If the unsupported spec has allowed properties it means it does not support a
-            // specific class whose fixed properties and allowed properties should match.
-            //   E.g: Doesn't support video calls but does support audio calls.
-            if (prUnsuportedClassSpec.allowedProperties().isEmpty()) {
-                if (piClassSpec.fixedProperties() == prUnsuportedClassSpec.fixedProperties()) {
-                    unsupported = true;
-                    break;
-                }
-            } else {
-                if (piClassSpec == prUnsuportedClassSpec) {
-                    unsupported = true;
-                    break;
-                }
-            }
-        }
-        if (!unsupported) {
-            classSpecs.append(piClassSpec);
-        }
-    }
-    mPriv->customCaps = ConnectionCapabilities(classSpecs);
-    return mPriv->customCaps;
-}
-
-/**
- * Return whether this account should be put online automatically whenever
- * possible.
- *
- * Change notification is via the connectsAutomaticallyPropertyChanged() signal.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return \c true if it should try to connect automatically, \c false
- *         otherwise.
- * \sa connectsAutomaticallyPropertyChanged(), setConnectsAutomatically()
- */
-bool Account::connectsAutomatically() const
-{
-    return mPriv->connectsAutomatically;
-}
-
-/**
- * Set whether this account should be put online automatically whenever
- * possible.
- *
- * \param value Value indicating if this account should be put online whenever
- *              possible.
- * \return A PendingOperation which will emit PendingOperation::finished
- *         when the request has been made.
- * \sa connectsAutomaticallyPropertyChanged(), connectsAutomatically()
- */
-PendingOperation *Account::setConnectsAutomatically(bool value)
-{
-    return new PendingVoid(
-            mPriv->properties->Set(
-                TP_QT_IFACE_ACCOUNT,
-                QLatin1String("ConnectAutomatically"),
-                QDBusVariant(value)),
-            AccountPtr(this));
-}
-
-/**
- * Return whether this account has ever been put online successfully.
- *
- * This property cannot change from \c true to \c false, only from \c false to \c true.
- * When the account successfully goes online for the first time, or when it
- * is detected that this has already happened, the firstOnline() signal is
- * emitted.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return \c true if ever been online, \c false otherwise.
- */
-bool Account::hasBeenOnline() const
-{
-    return mPriv->hasBeenOnline;
-}
-
-/**
- * Return the status of this account connection.
- *
- * Note that this method may return a different value from the one returned by Connection::status()
- * on this account connection. This happens because this value will change whenever the connection
- * status of this account connection changes and won't consider the Connection introspection
- * process. The same rationale also applies to connectionStatusReason() and
- * connectionErrorDetails().
- *
- * A valid use case for this is for account creation UIs that wish to display the accounts
- * connection status and nothing else on the connections (e.g. retrieve the contact list).
- *
- * Change notification is via the connectionStatusChanged() signal.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return The connection status as #ConnectionStatus.
- * \sa connectionStatusChanged(), connectionStatusReason(), connectionError(),
- *     connectionErrorDetails()
- */
-ConnectionStatus Account::connectionStatus() const
-{
-    return mPriv->connectionStatus;
-}
-
-/**
- * Return the reason for this account connection status.
- *
- * This represents the reason for the last change to connectionStatus().
- *
- * Note that this method may return a different value from the one returned by
- * Connection::statusReason() on this account connection.
- * See connectionStatus() for more details.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return The connection status reason as #ConnectionStatusReason.
- * \sa connectionStatusChanged(), connectionStatus(), connectionError(), connectionErrorDetails()
- */
-ConnectionStatusReason Account::connectionStatusReason() const
-{
-    return mPriv->connectionStatusReason;
-}
-
-/**
- * Return the D-Bus error name for the last disconnection or connection failure,
- * (in particular, #TP_QT_ERROR_CANCELLED if it was disconnected by user
- * request), or an empty string if the account is connected.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return The D-Bus error name for the last disconnection or connection failure.
- * \sa connectionErrorDetails(), connectionStatus(), connectionStatusReason(),
- *     connectionStatusChanged()
- */
-QString Account::connectionError() const
-{
-    return mPriv->connectionError;
-}
-
-/**
- * Return detailed information related to connectionError().
- *
- * Note that this method may return a different value from the one returned by
- * Connection::errorDetails() on this account connection.
- * See connectionStatus() for more details.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return The connection error details as a Connection::ErrorDetails object.
- * \sa connectionError(), connectionStatus(), connectionStatusReason(), connectionStatusChanged(),
- *     Connection::ErrorDetails.
- */
-Connection::ErrorDetails Account::connectionErrorDetails() const
-{
-    return mPriv->connectionErrorDetails;
-}
-
-/**
- * Return the object representing the connection of this account.
- *
- * Note that the Connection object returned by this method will have the
- * features set in the connectionFactory() used by this account ready.
- *
- * Change notification is via the connectionChanged() signal.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return A pointer to the Connection object, or a null ConnectionPtr if
- *         there is no connection currently or if an error occurred.
- * \sa connectionChanged()
- */
-ConnectionPtr Account::connection() const
-{
-    return mPriv->connection;
-}
-
-/**
- * Return whether this account connection is changing presence.
- *
- * Change notification is via the changingPresence() signal.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return \c true if changing presence, \c false otherwise.
- * \sa changingPresence(), currentPresenceChanged(), setRequestedPresence()
- */
-bool Account::isChangingPresence() const
-{
-    return mPriv->changingPresence;
-}
-
-/**
- * Return a list of presences allowed by a connection to this account.
- *
- * In particular, for the statuses reported here it can be assumed that setting them as the
- * requested presence via setRequestedPresence() will eventually result in currentPresence()
- * changing to exactly said presence. Other statuses are only guaranteed to be matched as closely as
- * possible.
- *
- * The statuses can be also used for the automatic presence, as set by setAutomaticPresence(), with
- * the exception of any status specifications for which Presence::type() is
- * Tp::ConnectionPresenceTypeOffline for the Presence returned by PresenceSpec::presence().
- *
- * However, the optional parameter can be used to allow reporting also other possible presence
- * statuses on this protocol besides the others that can be set on yourself. These are purely
- * informatory, for e.g. adjusting an UI to allow all possible remote contact statuses to be
- * displayed.
- *
- * An offline presence status is always included, because it's always valid to make an account
- * offline by setting the requested presence to an offline status.
- *
- * Full functionality requires Account::FeatureProtocolInfo and Account::FeatureProfile to be ready
- * as well as connection with Connection::FeatureSimplePresence enabled. If the connection is online
- * and Connection::FeatureSimplePresence is enabled, it will return the connection allowed statuses,
- * otherwise it will return a list os statuses based on profile() and protocolInfo() information
- * if the corresponding features are enabled.
- *
- * If there's a mismatch between the presence status info provided in the .profile file and/or the
- * .manager file and what an online Connection actually reports (for example, the said data files
- * are missing or too old to include presence information), the returned value can change, in
- * particular when connectionChanged() is emitted with a connection for which Connection::status()
- * is Tp::ConnectionStatusConnected.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \param includeAllStatuses Whether the returned list will include all statuses or just the ones
- *                           that can be settable using setRequestedPresence().
- * \return The allowed statuses as a list of PresenceSpec objects.
- */
-PresenceSpecList Account::allowedPresenceStatuses(bool includeAllStatuses) const
-{
-    QHash<QString, PresenceSpec> specMap;
-
-    // if the connection is online and ready use it
-    if (mPriv->connection &&
-        mPriv->connection->status() == ConnectionStatusConnected &&
-        mPriv->connection->actualFeatures().contains(Connection::FeatureSimplePresence)) {
-        SimpleStatusSpecMap connectionAllowedPresences =
-            mPriv->connection->lowlevel()->allowedPresenceStatuses();
-        SimpleStatusSpecMap::const_iterator i = connectionAllowedPresences.constBegin();
-        SimpleStatusSpecMap::const_iterator end = connectionAllowedPresences.constEnd();
-        for (; i != end; ++i) {
-            PresenceSpec presence = PresenceSpec(i.key(), i.value());
-            specMap.insert(i.key(), presence);
-        }
-    } else {
-        ProtocolInfo pi = protocolInfo();
-        if (pi.isValid()) {
-            // add all ProtocolInfo presences to the returned map
-            foreach (const PresenceSpec &piPresence, pi.allowedPresenceStatuses()) {
-                QString piStatus = piPresence.presence().status();
-                specMap.insert(piStatus, piPresence);
-            }
-        }
-
-        ProfilePtr pr;
-        if (isReady(FeatureProfile)) {
-            pr = profile();
-        }
-        if (pr && pr->isValid()) {
-            // add all Profile presences to the returned map
-            foreach (const Profile::Presence &prPresence, pr->presences()) {
-                QString prStatus = prPresence.id();
-                if (specMap.contains(prStatus)) {
-                    // we already got the presence from ProtocolInfo, just update
-                    // canHaveStatusMessage if needed
-                    PresenceSpec presence = specMap.value(prStatus);
-                    if (presence.canHaveStatusMessage() != prPresence.canHaveStatusMessage()) {
-                        SimpleStatusSpec spec;
-                        spec.type = presence.presence().type();
-                        spec.maySetOnSelf = presence.maySetOnSelf();
-                        spec.canHaveMessage = prPresence.canHaveStatusMessage();
-                        specMap.insert(prStatus, PresenceSpec(prStatus, spec));
-                    }
-                } else {
-                    // presence not found in ProtocolInfo, adding it
-                    specMap.insert(prStatus, presenceSpecForStatus(prStatus,
-                                prPresence.canHaveStatusMessage()));
-                }
-            }
-
-            // now remove all presences that are not in the Profile, if it does
-            // not allow other presences, and the ones that are disabled
-            QHash<QString, PresenceSpec>::iterator i = specMap.begin();
-            QHash<QString, PresenceSpec>::iterator end = specMap.end();
-            while (i != end) {
-                PresenceSpec presence = i.value();
-                QString status = presence.presence().status();
-                bool hasPresence = pr->hasPresence(status);
-                Profile::Presence prPresence = pr->presence(status);
-                if ((!hasPresence && !pr->allowOtherPresences()) || (hasPresence && prPresence.isDisabled())) {
-                     i = specMap.erase(i);
-                } else {
-                     ++i;
-                }
-            }
-        }
-    }
-
-    // filter out presences that may not be set on self if includeAllStatuses is false
-    if (!includeAllStatuses) {
-        QHash<QString, PresenceSpec>::iterator i = specMap.begin();
-        QHash<QString, PresenceSpec>::iterator end = specMap.end();
-        while (i != end) {
-            PresenceSpec presence = i.value();
-            if (!presence.maySetOnSelf()) {
-                i = specMap.erase(i);
-            } else {
-                ++i;
-            }
-        }
-    }
-
-    if (!specMap.size()) {
-        // If we didn't discover any statuses, either the protocol doesn't really support presence,
-        // or we lack information (e.g. features not enabled or info not provided in the .manager or
-        // .profile files). "available" - just the fact that you're online in the first place, is at
-        // least a valid option for any protocol, so we'll include it as a fallback.
-
-        specMap.insert(QLatin1String("available"),
-                presenceSpecForStatus(QLatin1String("available"), false));
-    }
-
-    // We'll always include "offline". It is always valid to make an account offline via
-    // setRequestedPresence().
-    if (!specMap.contains(QLatin1String("offline"))) {
-        specMap.insert(QLatin1String("offline"),
-                presenceSpecForStatus(QLatin1String("offline"), false));
-    }
-
-    return specMap.values();
-}
-
-/**
- * Return the maximum length for a presence status message.
- *
- * If a status message set using setRequestedPresence() (or setAutomaticPresence()) is longer than
- * the maximum length allowed, the message will be truncated and
- * currentPresenceChanged() will be emitted (if setting the presence worked)
- * with the truncated message.
- *
- * Full functionality requires Connection with Connection::FeatureSimplePresence
- * enabled. If the connection is online and Connection::FeatureSimplePresence is
- * enabled, it will return the connection maximum status message length,
- * otherwise it will return 0.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return The maximum length, or 0 if there is no limit.
- */
-uint Account::maxPresenceStatusMessageLength() const
-{
-    // if the connection is online and ready use it
-    if (mPriv->connection &&
-        mPriv->connection->status() == ConnectionStatusConnected &&
-        mPriv->connection->actualFeatures().contains(Connection::FeatureSimplePresence)) {
-        return mPriv->connection->lowlevel()->maxPresenceStatusMessageLength();
-    }
-
-    return 0;
-}
-
-/**
- * Return the presence status that this account will have set on it by the
- * account manager if it brings it online automatically.
- *
- * Change notification is via the automaticPresenceChanged() signal.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return The automatic presence as a Presence object.
- * \sa automaticPresenceChanged(), setAutomaticPresence()
- */
-Presence Account::automaticPresence() const
-{
-    return mPriv->automaticPresence;
-}
-
-/**
- * Set the presence status that this account should have if it is brought
- * online automatically by the account manager.
- *
- * Note that changing this property won't actually change the account's status
- * until the next time it is (re)connected for some reason.
- *
- * The value of this property must be one that would be acceptable for setRequestedPresence(),
- * as returned by allowedPresenceStatuses(), with the additional restriction that the offline
- * presence cannot be used.
- *
- * \param presence The presence to set when this account is brought
- *                 online automatically by the account manager.
- * \return A PendingOperation which will emit PendingOperation::finished
- *         when the request has been made.
- * \sa automaticPresenceChanged(), automaticPresence(), setRequestedPresence()
- */
-PendingOperation *Account::setAutomaticPresence(const Presence &presence)
-{
-    return new PendingVoid(
-            mPriv->properties->Set(
-                TP_QT_IFACE_ACCOUNT,
-                QLatin1String("AutomaticPresence"),
-                QDBusVariant(QVariant::fromValue(presence.barePresence()))),
-            AccountPtr(this));
-}
-
-/**
- * Return the actual presence of this account.
- *
- * Change notification is via the currentPresenceChanged() signal.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return The current presence as a Presence object.
- * \sa currentPresenceChanged(), setRequestedPresence(), requestedPresence(), automaticPresence()
- */
-Presence Account::currentPresence() const
-{
-    return mPriv->currentPresence;
-}
-
-/**
- * Return the requested presence of this account.
- *
- * Change notification is via the requestedPresenceChanged() signal.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return The requested presence as a Presence object.
- * \sa requestedPresenceChanged(), setRequestedPresence(), currentPresence(), automaticPresence()
- */
-Presence Account::requestedPresence() const
-{
-    return mPriv->requestedPresence;
-}
-
-/**
- * Set the requested presence of this account.
- *
- * When the requested presence is changed, the account manager will attempt to
- * manipulate the connection to make currentPresence() match requestedPresence()
- * as closely as possible.
- *
- * \param presence The requested presence.
- * \return A PendingOperation which will emit PendingOperation::finished
- *         when the request has been made.
- * \sa requestedPresenceChanged(), currentPresence(), automaticPresence(), setAutomaticPresence()
- */
-PendingOperation *Account::setRequestedPresence(const Presence &presence)
-{
-    return new PendingVoid(
-            mPriv->properties->Set(
-                TP_QT_IFACE_ACCOUNT,
-                QLatin1String("RequestedPresence"),
-                QDBusVariant(QVariant::fromValue(presence.barePresence()))),
-            AccountPtr(this));
-}
-
-/**
- * Return whether this account is online.
- *
- * Change notification is via the onlinenessChanged() signal.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return \c true if online, otherwise \c false.
- * \sa onlinenessChanged()
- */
-bool Account::isOnline() const
-{
-    return mPriv->currentPresence.type() != ConnectionPresenceTypeOffline;
-}
-
-/**
- * Return the unique identifier of this account.
- *
- * \return The unique identifier.
- */
-QString Account::uniqueIdentifier() const
-{
-    QString path = objectPath();
-    return path.right(path.length() -
-            strlen("/org/freedesktop/Telepathy/Account/"));
-}
-
-/**
- * Return the normalized user ID of the local user of this account.
- *
- * It is unspecified whether this user ID is globally unique.
- *
- * As currently implemented, IRC user IDs are only unique within the same
- * IRCnet. On some saner protocols, the user ID includes a DNS name which
- * provides global uniqueness.
- *
- * If this value is not known yet (which will always be the case for accounts
- * that have never been online), it will be an empty string.
- *
- * It is possible that this value will change if the connection manager's
- * normalization algorithm changes.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return The normalized user ID of the local user.
- * \sa normalizedNameChanged()
- */
-QString Account::normalizedName() const
-{
-    return mPriv->normalizedName;
-}
-
-/**
- * If this account is currently connected, disconnect and reconnect it. If it
- * is currently trying to connect, cancel the attempt to connect and start
- * another. If it is currently disconnected, do nothing.
- *
- * \return A PendingOperation which will emit PendingOperation::finished
- *         when the request has been made.
- */
-PendingOperation *Account::reconnect()
-{
-    return new PendingVoid(baseInterface()->Reconnect(), AccountPtr(this));
-}
-
-/**
- * Delete this account.
- *
- * \return A PendingOperation which will emit PendingOperation::finished
- *         when the request has been made.
- * \sa removed()
- */
-PendingOperation *Account::remove()
-{
-    return new PendingVoid(baseInterface()->Remove(), AccountPtr(this));
-}
-
-/**
- * Return whether passing hints on channel requests on this account is known to be supported.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return \c true if supported, \c false otherwise.
- */
-bool Account::supportsRequestHints() const
-{
-    return mPriv->dispatcherContext->supportsHints;
-}
-
-/**
- * Return whether the ChannelRequest::succeeded(const Tp::ChannelPtr &channel) signal is expected to
- * be emitted with a non-NULL channel parameter for requests made using this account.
- *
- * This can be used as a run-time check for the Channel Dispatcher implementation being new enough.
- * In particular, similarly old Channel Dispatchers don't support request hints either, so the
- * return value for this function and Account::supportsRequestHints() will bet he same.
- *
- * This method requires Account::FeatureCore to be ready.
- *
- * \return \c true if supported, \c false otherwise.
- */
-bool Account::requestsSucceedWithChannel() const
-{
-    return supportsRequestHints();
-}
-
-/**
- * Start a request to ensure that a text channel with the given
- * contact \a contactIdentifier exists, creating it if necessary.
- *
- * See ensureChannel() for more details.
- *
- * \param contactIdentifier The identifier of the contact to chat with.
- * \param userActionTime The time at which user action occurred, or QDateTime()
- *                       if this channel request is for some reason not
- *                       involving user action.
- * \param preferredHandler Either the well-known bus name (starting with
- *                         org.freedesktop.Telepathy.Client.) of the preferred
- *                         handler for this channel, or an empty string to
- *                         indicate that any handler would be acceptable.
- * \param hints Arbitrary metadata which will be relayed to the handler if supported,
- *              as indicated by supportsRequestHints().
- * \return A PendingChannelRequest which will emit PendingChannelRequest::finished
- *         when the request has been made.
- * \sa ensureChannel(), createChannel()
- */
-PendingChannelRequest *Account::ensureTextChat(
-        const QString &contactIdentifier,
-        const QDateTime &userActionTime,
-        const QString &preferredHandler,
-        const ChannelRequestHints &hints)
-{
-    QVariantMap request = textChatRequest(contactIdentifier);
-
-    return new PendingChannelRequest(AccountPtr(this), request, userActionTime,
-            preferredHandler, false, hints);
-}
-
-/**
- * Start a request to ensure that a text channel with the given
- * contact \a contact exists, creating it if necessary.
- *
- * See ensureChannel() for more details.
- *
- * \param contact The contact to chat with.
- * \param userActionTime The time at which user action occurred, or QDateTime()
- *                       if this channel request is for some reason not
- *                       involving user action.
- * \param preferredHandler Either the well-known bus name (starting with
- *                         org.freedesktop.Telepathy.Client.) of the preferred
- *                         handler for this channel, or an empty string to
- *                         indicate that any handler would be acceptable.
- * \param hints Arbitrary metadata which will be relayed to the handler if supported,
- *              as indicated by supportsRequestHints().
- * \return A PendingChannelRequest which will emit PendingChannelRequest::finished
- *         when the request has been made.
- * \sa ensureChannel(), createChannel()
- */
-PendingChannelRequest *Account::ensureTextChat(
-        const ContactPtr &contact,
-        const QDateTime &userActionTime,
-        const QString &preferredHandler,
-        const ChannelRequestHints &hints)
-{
-    QVariantMap request = textChatRequest(contact);
-
-    return new PendingChannelRequest(AccountPtr(this), request, userActionTime,
-            preferredHandler, false, hints);
-}
-
-/**
- * Start a request to ensure that a text chat room with the given
- * room name \a roomName exists, creating it if necessary.
- *
- * See ensureChannel() for more details.
- *
- * \param roomName The name of the chat room.
- * \param userActionTime The time at which user action occurred, or QDateTime()
- *                       if this channel request is for some reason not
- *                       involving user action.
- * \param preferredHandler Either the well-known bus name (starting with
- *                         org.freedesktop.Telepathy.Client.) of the preferred
- *                         handler for this channel, or an empty string to
- *                         indicate that any handler would be acceptable.
- * \param hints Arbitrary metadata which will be relayed to the handler if supported,
- *              as indicated by supportsRequestHints().
- * \return A PendingChannelRequest which will emit PendingChannelRequest::finished
- *         when the request has been made.
- * \sa ensureChannel(), createChannel()
- */
-PendingChannelRequest *Account::ensureTextChatroom(
-        const QString &roomName,
-        const QDateTime &userActionTime,
-        const QString &preferredHandler,
-        const ChannelRequestHints &hints)
-{
-    QVariantMap request = textChatroomRequest(roomName);
-
-    return new PendingChannelRequest(AccountPtr(this), request, userActionTime,
-            preferredHandler, false, hints);
-}
-
-/**
- * Start a request to ensure that an audio call channel with the given
- * contact \a contactIdentifier exists, creating it if necessary.
- *
- * See ensureChannel() for more details.
- *
- * \param contactIdentifier The identifier of the contact to call.
- * \param initialAudioContentName The name of the initial CallContent that will
- *                                be automatically added on the channel.
- * \param userActionTime The time at which user action occurred, or QDateTime()
- *                       if this channel request is for some reason not
- *                       involving user action.
- * \param preferredHandler Either the well-known bus name (starting with
- *                         org.freedesktop.Telepathy.Client.) of the preferred
- *                         handler for this channel, or an empty string to
- *                         indicate that any handler would be acceptable.
- * \param hints Arbitrary metadata which will be relayed to the handler if supported,
- *              as indicated by supportsRequestHints().
- * \return A PendingChannelRequest which will emit PendingChannelRequest::finished
- *         when the request has been made.
- * \sa ensureChannel(), createChannel()
- */
-PendingChannelRequest *Account::ensureAudioCall(
-        const QString &contactIdentifier,
-        const QString &initialAudioContentName,
-        const QDateTime &userActionTime,
-        const QString &preferredHandler,
-        const ChannelRequestHints &hints)
-{
-    QVariantMap request = audioCallRequest(contactIdentifier, initialAudioContentName);
-
-    return new PendingChannelRequest(AccountPtr(this), request, userActionTime,
-            preferredHandler, false, hints);
-}
-
-/**
- * Start a request to ensure that an audio call channel with the given
- * contact \a contact exists, creating it if necessary.
- *
- * See ensureChannel() for more details.
- *
- * \param contact The contact to call.
- * \param initialAudioContentName The name of the initial audio CallContent that
- *                                will be automatically added on the channel.
- * \param userActionTime The time at which user action occurred, or QDateTime()
- *                       if this channel request is for some reason not
- *                       involving user action.
- * \param preferredHandler Either the well-known bus name (starting with
- *                         org.freedesktop.Telepathy.Client.) of the preferred
- *                         handler for this channel, or an empty string to
- *                         indicate that any handler would be acceptable.
- * \param hints Arbitrary metadata which will be relayed to the handler if supported,
- *              as indicated by supportsRequestHints().
- * \return A PendingChannelRequest which will emit PendingChannelRequest::finished
- *         when the request has been made.
- * \sa ensureChannel(), createChannel()
- */
-PendingChannelRequest* Account::ensureAudioCall(
-        const ContactPtr &contact,
-        const QString &initialAudioContentName,
-        const QDateTime &userActionTime,
-        const QString &preferredHandler,
-        const ChannelRequestHints &hints)
-{
-    QVariantMap request = audioCallRequest(contact, initialAudioContentName);
-
-    return new PendingChannelRequest(AccountPtr(this), request, userActionTime,
-            preferredHandler, false, hints);
-}
-
-/**
- * Start a request to ensure that a video call channel with the given
- * contact \a contactIdentifier exists, creating it if necessary.
- *
- * See ensureChannel() for more details.
- *
- * \param contactIdentifier The identifier of the contact to call.
- * \param initialVideoContentName The name of the initial video CallContent that
- *                                will be automatically added on the channel.
- * \param userActionTime The time at which user action occurred, or QDateTime()
- *                       if this channel request is for some reason not
- *                       involving user action.
- * \param preferredHandler Either the well-known bus name (starting with
- *                         org.freedesktop.Telepathy.Client.) of the preferred
- *                         handler for this channel, or an empty string to
- *                         indicate that any handler would be acceptable.
- * \param hints Arbitrary metadata which will be relayed to the handler if supported,
- *              as indicated by supportsRequestHints().
- * \return A PendingChannelRequest which will emit PendingChannelRequest::finished
- *         when the request has been made.
- * \sa ensureChannel(), createChannel()
- */
-PendingChannelRequest *Account::ensureVideoCall(
-        const QString &contactIdentifier,
-        const QString &initialVideoContentName,
-        const QDateTime &userActionTime,
-        const QString &preferredHandler,
-        const ChannelRequestHints &hints)
-{
-    QVariantMap request = videoCallRequest(contactIdentifier, initialVideoContentName);
-
-    return new PendingChannelRequest(AccountPtr(this), request, userActionTime,
-            preferredHandler, false, hints);
-}
-
-/**
- * Start a request to ensure that a video call channel with the given
- * contact \a contact exists, creating it if necessary.
- *
- * See ensureChannel() for more details.
- *
- * \param contact The contact to call.
- * \param initialVideoContentName The name of the initial video CallContent that
- *                                will be automatically added on the channel.
- * \param userActionTime The time at which user action occurred, or QDateTime()
- *                       if this channel request is for some reason not
- *                       involving user action.
- * \param preferredHandler Either the well-known bus name (starting with
- *                         org.freedesktop.Telepathy.Client.) of the preferred
- *                         handler for this channel, or an empty string to
- *                         indicate that any handler would be acceptable.
- * \param hints Arbitrary metadata which will be relayed to the handler if supported,
- *              as indicated by supportsRequestHints().
- * \return A PendingChannelRequest which will emit PendingChannelRequest::finished
- *         when the request has been made.
- * \sa ensureChannel(), createChannel()
- */
-PendingChannelRequest *Account::ensureVideoCall(
-        const ContactPtr &contact,
-        const QString &initialVideoContentName,
-        const QDateTime &userActionTime,
-        const QString &preferredHandler,
-        const ChannelRequestHints &hints)
-{
-    QVariantMap request = videoCallRequest(contact, initialVideoContentName);
-
-    return new PendingChannelRequest(AccountPtr(this), request, userActionTime,
-            preferredHandler, false, hints);
-}
-
-/**
- * Start a request to ensure that an audio/video call channel with the given
- * contact \a contactIdentifier exists, creating it if necessary.
- *
- * See ensureChannel() for more details.
- *
- * \param contactIdentifier The identifier of the contact to call.
- * \param initialAudioContentName The name of the initial audio CallContent that
- *                                will be automatically added on the channel.
- * \param initialVideoContentName The name of the initial video CallContent that