Merge branch 'stube-channel-api-break-fix-0.6' into telepathy-qt4-0.6

Reviewed-by: Olli Salli (oggis) <olli.salli@collabora.co.uk>

2 files changed, 10 insertions, 0 deletions

diff --git a/TelepathyQt4/stream-tube-channel.cpp b/TelepathyQt4/stream-tube-channel.cpp
index 2c71bb39..4f8fcf74 100644
--- a/TelepathyQt4/stream-tube-channel.cpp
+++ b/TelepathyQt4/stream-tube-channel.cpp
@@ -616,6 +616,15 @@ QString StreamTubeChannel::localAddress() const
     return mPriv->unixAddress;
 }
 
+/**
+ * This method never did anything useful when called from outside, and now does nothing at all. It
+ * will be removed in the next API/ABI break.
+ */
+void StreamTubeChannel::setBaseTubeType(uint type)
+{
+    Q_UNUSED(type);
+}
+
 void StreamTubeChannel::setConnections(UIntList connections)
 {
     mPriv->connections = connections;
diff --git a/TelepathyQt4/stream-tube-channel.h b/TelepathyQt4/stream-tube-channel.h
index 42ba7798..eb3512f4 100644
--- a/TelepathyQt4/stream-tube-channel.h
+++ b/TelepathyQt4/stream-tube-channel.h
@@ -80,6 +80,7 @@ protected:
             const QVariantMap &immutableProperties,
             const Feature &coreFeature = StreamTubeChannel::FeatureCore);
 
+    void setBaseTubeType(uint type);
     void setConnections(UIntList connections);
     void setAddressType(SocketAddressType type);
     SocketAccessControl accessControl() const;