1 files changed, 28 insertions, 2 deletions
diff --git a/src/mdevicestate.h b/src/mdevicestate.h
index 3751db0..ef924c4 100644
--- a/src/mdevicestate.h
+++ b/src/mdevicestate.h
@@ -20,16 +20,38 @@
 #ifndef MDEVICESTATE_H
 #define MDEVICESTATE_H
 
-#include <QObject>
 #ifdef GLES2_VERSION
 #include <QtDBus>
+
+struct ChannelDetails
+{
+    QDBusObjectPath channel;
+    QVariantMap properties;
+};
+
+bool operator==(const ChannelDetails& v1, const ChannelDetails& v2);
+inline bool operator!=(const ChannelDetails& v1, const ChannelDetails& v2)
+{
+    return !operator==(v1, v2);
+}
+QDBusArgument& operator<<(QDBusArgument& arg, const ChannelDetails& val);
+const QDBusArgument& operator>>(const QDBusArgument& arg, ChannelDetails& val);
+
+typedef QList<ChannelDetails> ChannelDetailsList;
+
+Q_DECLARE_METATYPE(ChannelDetails);
+Q_DECLARE_METATYPE(ChannelDetailsList);
 #endif
+#include <QObject>
 
 /*!
  * This is a class listening to device state that is of interest to
  * MCompositeManager.
  */
 class MDeviceState: public QObject
+#ifdef GLES2_VERSION
+                    , protected QDBusContext
+#endif
 {
     Q_OBJECT
 
@@ -50,13 +72,17 @@ private slots:
 
 #ifdef GLES2_VERSION
     void mceDisplayStatusIndSignal(QString mode);
-    void csdActivityChangedSignal(QString mode);
+    void channelsReply(QDBusPendingCallWatcher *watcher);
+    void newChannelsSignal(const ChannelDetailsList &l);
+    void channelClosed();
 #endif
 
 private:
 
 #ifdef GLES2_VERSION
     QDBusConnection *systembus_conn;
+    QDBusConnection *sessionbus_conn;
+    QSet<QString> ongoing_calls;
 #endif
     bool display_off;
     bool ongoing_call;