telepathy-qt: dbus-tubes: Remove unneeded function

[Dario Freddi]

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

Author: Dario Freddi <dario.freddi at collabora.co.uk>
Date:   Tue Mar 15 18:07:10 2011 +0100

dbus-tubes: Remove unneeded function

---

 TelepathyQt/dbus-tube-channel.cpp          |    5 -----
 TelepathyQt/dbus-tube-channel.h            |    2 --
 TelepathyQt/incoming-dbus-tube-channel.cpp |    2 +-
 TelepathyQt/outgoing-dbus-tube-channel.cpp |    2 +-
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/TelepathyQt/dbus-tube-channel.cpp b/TelepathyQt/dbus-tube-channel.cpp
index 49d6c63..fc37524 100644
--- a/TelepathyQt/dbus-tube-channel.cpp
+++ b/TelepathyQt/dbus-tube-channel.cpp
@@ -363,11 +363,6 @@ QHash< ContactPtr, QString > DBusTubeChannel::busNames() const
     return mPriv->busNames;
 }
 
-UIntList DBusTubeChannel::accessControls() const
-{
-    return mPriv->accessControls;
-}
-
 // Signals documentation
 /**
  * \fn void DBusTubeChannel::busNamesChanged(const QHash< ContactPtr, QString > &added, const QList< ContactPtr > &removed)
diff --git a/TelepathyQt/dbus-tube-channel.h b/TelepathyQt/dbus-tube-channel.h
index 2496e6d..33d9cdc 100644
--- a/TelepathyQt/dbus-tube-channel.h
+++ b/TelepathyQt/dbus-tube-channel.h
@@ -54,8 +54,6 @@ public:
 
     QString address() const;
 
-    UIntList accessControls() const;
-
 protected:
     DBusTubeChannel(const ConnectionPtr &connection, const QString &objectPath,
             const QVariantMap &immutableProperties);
diff --git a/TelepathyQt/incoming-dbus-tube-channel.cpp b/TelepathyQt/incoming-dbus-tube-channel.cpp
index ff604bd..ad1513f 100644
--- a/TelepathyQt/incoming-dbus-tube-channel.cpp
+++ b/TelepathyQt/incoming-dbus-tube-channel.cpp
@@ -215,7 +215,7 @@ PendingDBusTubeAccept *IncomingDBusTubeChannel::acceptTube(
     }
 
     // Let's offer the tube
-    if (!accessControls().contains(accessControl)) {
+    if (requireCredentials && !supportsCredentials()) {
         warning() << "You requested an access control "
             "not supported by this channel";
         return new PendingDBusTubeAccept(QLatin1String(TP_QT_ERROR_NOT_IMPLEMENTED),
diff --git a/TelepathyQt/outgoing-dbus-tube-channel.cpp b/TelepathyQt/outgoing-dbus-tube-channel.cpp
index 3c0ecc2..c9b26eb 100644
--- a/TelepathyQt/outgoing-dbus-tube-channel.cpp
+++ b/TelepathyQt/outgoing-dbus-tube-channel.cpp
@@ -176,7 +176,7 @@ PendingDBusTubeOffer *OutgoingDBusTubeChannel::offerTube(
     }
 
     // Let's offer the tube
-    if (!accessControls().contains(accessControl)) {
+    if (requireCredentials && !supportsCredentials()) {
         warning() << "You requested an access control "
             "not supported by this channel";
         return new PendingDBusTubeOffer(QLatin1String(TP_QT_ERROR_NOT_IMPLEMENTED),