telepathy-qt: dbus-tubes: Use a single implementation for pending DBus Tubes

[Dario Freddi]

Module: telepathy-qt
Branch: master
Commit: b69bb13a893b7eae109cff2c0c5e66caaf77c6de
URL:    http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=b69bb13a893b7eae109cff2c0c5e66caaf77c6de

Author: Dario Freddi <dario.freddi at collabora.co.uk>
Date:   Fri Jun  3 23:29:04 2011 +0200

dbus-tubes: Use a single implementation for pending DBus Tubes

---

 TelepathyQt/CMakeLists.txt                         |   12 +-
 TelepathyQt/PendingDBusTube                        |   13 ++
 TelepathyQt/PendingDBusTubeAccept                  |   13 --
 TelepathyQt/PendingDBusTubeOffer                   |   13 --
 TelepathyQt/dbus-tube-channel.h                    |    3 +-
 TelepathyQt/incoming-dbus-tube-channel.cpp         |   20 ++--
 TelepathyQt/incoming-dbus-tube-channel.h           |    4 +-
 TelepathyQt/outgoing-dbus-tube-channel.cpp         |   16 +-
 TelepathyQt/outgoing-dbus-tube-channel.h           |    4 +-
 TelepathyQt/pending-dbus-tube-accept.h             |   62 --------
 TelepathyQt/pending-dbus-tube-offer.cpp            |  151 --------------------
 ...-dbus-tube-accept.cpp => pending-dbus-tube.cpp} |   95 +++++++++----
 ...nding-dbus-tube-offer.h => pending-dbus-tube.h} |   23 ++--
 13 files changed, 122 insertions(+), 307 deletions(-)

Diff:   http://cgit.freedesktop.org/telepathy/telepathy-qt/diff/?id=b69bb13a893b7eae109cff2c0c5e66caaf77c6de