diff options
author | Kimmo Hämäläinen <kimmo.hamalainen@nokia.com> | 2010-04-29 18:02:18 +0300 |
---|---|---|
committer | Kimmo Hämäläinen <kimmo.hamalainen@nokia.com> | 2010-04-29 18:02:18 +0300 |
commit | 63b3a0e9d89bd4aabc2f14ca2b111d6b14256a55 (patch) | |
tree | 81a515e9fa1addb642a2db7bc62b03fbdd9e1e02 /src/mdevicestate.h | |
parent | 30e03f7345fee778bd694371332671bfe07b866d (diff) |
Fixes: NB#
New: Ask Telepathy about the call state on startup
Changes: fix problems with (un)fullscreen decorations
RevBy:
Details:
Diffstat (limited to 'src/mdevicestate.h')
-rw-r--r-- | src/mdevicestate.h | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/src/mdevicestate.h b/src/mdevicestate.h index 177809a..1d8dea3 100644 --- a/src/mdevicestate.h +++ b/src/mdevicestate.h @@ -20,10 +20,29 @@ #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 @@ -51,12 +70,14 @@ private slots: #ifdef GLES2_VERSION void mceDisplayStatusIndSignal(QString mode); void csdActivityChangedSignal(QString mode); + void channelsReply(QDBusPendingCallWatcher *watcher); #endif private: #ifdef GLES2_VERSION QDBusConnection *systembus_conn; + QDBusConnection *sessionbus_conn; #endif bool display_off; bool ongoing_call; |