diff options
| author | Tomasz Sterna <tomek@xiaoka.com> | 2014-07-06 09:34:43 +0200 |
|---|---|---|
| committer | Tomasz Sterna <tomek@xiaoka.com> | 2014-07-09 01:57:32 +0200 |
| commit | 83d3db78d63b1b8e21277fafd1ee0238fd7e3ddd (patch) | |
| tree | 5c0fa8c74f8f3baa03cba6c6b25ae85adf2a4c06 /daemon/manager.cpp | |
| parent | 1358e9c672eb186abec781900465988a04a1413e (diff) | |
Moved DBus service related properties to DBusProxy class
Diffstat (limited to 'daemon/manager.cpp')
| -rw-r--r-- | daemon/manager.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/daemon/manager.cpp b/daemon/manager.cpp index ae757e6..4ba2a8b 100644 --- a/daemon/manager.cpp +++ b/daemon/manager.cpp @@ -37,12 +37,13 @@ Manager::Manager(watch::WatchConnector *watch, DBusConnector *dbus, VoiceCallMan dbus->findPebble(); } - DBusAdaptor *adaptor = new DBusAdaptor(this); + DBusProxy *proxy = new DBusProxy(this); + DBusAdaptor *adaptor = new DBusAdaptor(proxy); QDBusConnection connection = QDBusConnection::sessionBus(); - connection.registerObject("/", this); + connection.registerObject("/", proxy); connection.registerService("org.pebbled"); - connect(this, SIGNAL(pebbleChanged()), adaptor, SIGNAL(pebbleChanged())); - connect(this, SIGNAL(connectedChanged()), adaptor, SIGNAL(connectedChanged())); + connect(dbus, SIGNAL(pebbleChanged()), adaptor, SIGNAL(pebbleChanged())); + connect(watch, SIGNAL(connectedChanged()), adaptor, SIGNAL(connectedChanged())); } void Manager::onPebbleChanged() @@ -54,7 +55,6 @@ void Manager::onPebbleChanged() } else { watch->deviceConnect(name, pebble["Address"].toString()); } - emit pebbleChanged(); } void Manager::onConnectedChanged() @@ -70,7 +70,6 @@ void Manager::onConnectedChanged() if (!notification.publish()) { qDebug() << "Failed publishing notification"; } - emit connectedChanged(); } void Manager::onActiveVoiceCallChanged() |