diff options
| author | Tomasz Sterna <tomek@xiaoka.com> | 2014-07-06 02:56:39 +0200 |
|---|---|---|
| committer | Tomasz Sterna <tomek@xiaoka.com> | 2014-07-09 01:57:32 +0200 |
| commit | 66fcda8bf06abcc557d2d435b5dc0562de3a9566 (patch) | |
| tree | 5b1b53ee834514178790a7a6ef87cdcf17d0ef1e /daemon/manager.cpp | |
| parent | 558e07f125eea64436e2097b8a35c9c348b5204e (diff) | |
Implemented org.pebbled DBus service
Diffstat (limited to 'daemon/manager.cpp')
| -rw-r--r-- | daemon/manager.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/daemon/manager.cpp b/daemon/manager.cpp index 7360736..ae757e6 100644 --- a/daemon/manager.cpp +++ b/daemon/manager.cpp @@ -1,4 +1,5 @@ #include "manager.h" +#include "dbusadaptor.h" #include <QDebug> #include <QtContacts/QContact> @@ -18,8 +19,6 @@ Manager::Manager(watch::WatchConnector *watch, DBusConnector *dbus, VoiceCallMan conversations = new GroupManager(this); connect(conversations, SIGNAL(groupAdded(GroupObject*)), SLOT(onConversationGroupAdded(GroupObject*))); - connect(conversations, SIGNAL(groupUpdated(GroupObject*)), SLOT(onConversationGroupUpdated(GroupObject*))); - connect(conversations, SIGNAL(groupDeleted(GroupObject*)), SLOT(onConversationGroupDeleted(GroupObject*))); conversations->getGroups(); connect(voice, SIGNAL(activeVoiceCallChanged()), SLOT(onActiveVoiceCallChanged())); @@ -37,6 +36,13 @@ Manager::Manager(watch::WatchConnector *watch, DBusConnector *dbus, VoiceCallMan connect(dbus, SIGNAL(pebbleChanged()), SLOT(onPebbleChanged())); dbus->findPebble(); } + + DBusAdaptor *adaptor = new DBusAdaptor(this); + QDBusConnection connection = QDBusConnection::sessionBus(); + connection.registerObject("/", this); + connection.registerService("org.pebbled"); + connect(this, SIGNAL(pebbleChanged()), adaptor, SIGNAL(pebbleChanged())); + connect(this, SIGNAL(connectedChanged()), adaptor, SIGNAL(connectedChanged())); } void Manager::onPebbleChanged() @@ -48,6 +54,7 @@ void Manager::onPebbleChanged() } else { watch->deviceConnect(name, pebble["Address"].toString()); } + emit pebbleChanged(); } void Manager::onConnectedChanged() @@ -63,6 +70,7 @@ void Manager::onConnectedChanged() if (!notification.publish()) { qDebug() << "Failed publishing notification"; } + emit connectedChanged(); } void Manager::onActiveVoiceCallChanged() |