[Telepathy-commits] [telepathy-qt4/master] Expose the channel type, handle type and handle in Channel

[Olli Salli]

---
 TelepathyQt4/cli-channel.cpp |   15 +++++++++++++++
 TelepathyQt4/cli-channel.h   |   28 ++++++++++++++++++++++++----
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/TelepathyQt4/cli-channel.cpp b/TelepathyQt4/cli-channel.cpp
index 6a0e268..29a8271 100644
--- a/TelepathyQt4/cli-channel.cpp
+++ b/TelepathyQt4/cli-channel.cpp
@@ -193,6 +193,21 @@ QStringList Channel::interfaces() const
     return mPriv->interfaces;
 }
 
+QString Channel::channelType() const
+{
+    return mPriv->channelType;
+}
+
+uint Channel::targetHandleType() const
+{
+    return mPriv->targetHandleType;
+}
+
+uint Channel::targetHandle() const
+{
+    return mPriv->targetHandle;
+}
+
 void Channel::gotMainProperties(QDBusPendingCallWatcher* watcher)
 {
     QDBusPendingReply<QVariantMap> reply = *watcher;
diff --git a/TelepathyQt4/cli-channel.h b/TelepathyQt4/cli-channel.h
index b829abb..237c9cc 100644
--- a/TelepathyQt4/cli-channel.h
+++ b/TelepathyQt4/cli-channel.h
@@ -51,6 +51,7 @@ namespace Client
 /**
  * \class Channel
  * \ingroup clientchannel
+ * \headerfile TelepathyQt4/cli-channel.h <TelepathyQt4/Client/Channel>
  *
  * High-level proxy object for accessing remote %Telepathy %Channel objects.
  */
@@ -131,14 +132,33 @@ public:
 
     /**
      * Returns a list of optional interfaces implemented by the remote object.
-     * The contents of the list are undefined unless the Channel has readiness
-     * #ReadinessFull. The returned value stays constant for the entire lifetime
-     * of the Channel after reaching full readiness.
      *
-     * \return D-Bus names of the supported interfaces.
+     * \return D-Bus names of the implemented optional interfaces.
      */
     QStringList interfaces() const;
 
+    /**
+     * Returns the type of this channel.
+     *
+     * \return D-Bus interface name for the type of the channel.
+     */
+    QString channelType() const;
+
+    /**
+     * Returns the type of the handle returned by #targetHandle().
+     *
+     * \return The type of the handle, as specified in #HandleType.
+     */
+    uint targetHandleType() const;
+
+    /**
+     * Returns the handle of the remote party with which this channel
+     * communicates.
+     *
+     * \return The handle, which is of the type #targetHandleType() indicates.
+     */
+    uint targetHandle() const;
+
 Q_SIGNALS:
     /**
      * Emitted whenever the readiness of the Channel changes.
-- 
1.5.6.5