[Telepathy-commits] [telepathy-qt4/master] Make Tp::Client::Channel inherit from DBusProxy class.

[George Goldberg]

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

diff --git a/TelepathyQt4/cli-channel.cpp b/TelepathyQt4/cli-channel.cpp
index 2a20adf..372c1ad 100644
--- a/TelepathyQt4/cli-channel.cpp
+++ b/TelepathyQt4/cli-channel.cpp
@@ -401,7 +401,8 @@ struct Channel::Private
 Channel::Channel(Connection* connection,
                  const QString& objectPath,
                  QObject* parent)
-  : mPriv(new Private(*this, connection))
+  : DBusProxy(connection, parent),
+    mPriv(new Private(*this, connection))
 {
     mPriv->baseInterface = new ChannelInterface(connection->service(), objectPath, this);
 
diff --git a/TelepathyQt4/cli-channel.h b/TelepathyQt4/cli-channel.h
index 82f4071..46603a8 100644
--- a/TelepathyQt4/cli-channel.h
+++ b/TelepathyQt4/cli-channel.h
@@ -55,6 +55,7 @@ class Channel;
 
 #include <TelepathyQt4/Client/Connection>
 #include <TelepathyQt4/Client/DBus>
+#include <TelepathyQt4/Client/DBusProxy>
 #include <TelepathyQt4/Client/OptionalInterfaceFactory>
 
 namespace Telepathy
@@ -92,7 +93,7 @@ namespace Client
  * signaled by Connection::readinessChanged) or is deleted, the Channel object
  * will transition to ReadinessDead too.
  */
-class Channel : public QObject, private OptionalInterfaceFactory
+class Channel : public DBusProxy, private OptionalInterfaceFactory
 {
     Q_OBJECT
     Q_ENUMS(Readiness)
-- 
1.5.6.5