summaryrefslogtreecommitdiff
path: root/daemon/manager.cpp
diff options
context:
space:
mode:
authorTomasz Sterna <tomek@xiaoka.com>2014-08-13 22:03:34 +0200
committerTomasz Sterna <tomek@xiaoka.com>2014-08-13 22:03:34 +0200
commitacd137e98a5bb4bbca2fa66b84cd680ab20dafcf (patch)
tree4ce8cd77fed29e6e47212e130a3c8de764adcb7f /daemon/manager.cpp
parent3ece26b79ab9565bedc0f8b68f248efcb310df3d (diff)
Fixed handling of connected signal in Manager app
Diffstat (limited to 'daemon/manager.cpp')
-rw-r--r--daemon/manager.cpp19
1 files changed, 10 insertions, 9 deletions
diff --git a/daemon/manager.cpp b/daemon/manager.cpp
index fd31e3d..b01006c 100644
--- a/daemon/manager.cpp
+++ b/daemon/manager.cpp
@@ -35,15 +35,6 @@ Manager::Manager(watch::WatchConnector *watch, DBusConnector *dbus, VoiceCallMan
connect(watch, SIGNAL(messageDecoded(uint,QByteArray)), commands, SLOT(processMessage(uint,QByteArray)));
connect(commands, SIGNAL(hangup()), SLOT(hangupAll()));
- // Set BT icon for notification
- notification.setImage("icon-system-bluetooth-device");
-
- if (btDevice.isValid()) {
- logger()->debug() << "BT local name:" << btDevice.name();
- connect(dbus, SIGNAL(pebbleChanged()), SLOT(onPebbleChanged()));
- dbus->findPebble();
- }
-
PebbledProxy *proxy = new PebbledProxy(this);
PebbledAdaptor *adaptor = new PebbledAdaptor(proxy);
QDBusConnection session = QDBusConnection::sessionBus();
@@ -62,6 +53,16 @@ Manager::Manager(watch::WatchConnector *watch, DBusConnector *dbus, VoiceCallMan
this, SLOT(onMprisPropertiesChanged(QString,QMap<QString,QVariant>,QStringList)));
connect(this, SIGNAL(mprisMetadataChanged(QVariantMap)), commands, SLOT(onMprisMetadataChanged(QVariantMap)));
+
+ // Set BT icon for notification
+ notification.setImage("icon-system-bluetooth-device");
+
+ if (btDevice.isValid()) {
+ logger()->debug() << "BT local name:" << btDevice.name();
+ connect(dbus, SIGNAL(pebbleChanged()), SLOT(onPebbleChanged()));
+ dbus->findPebble();
+ }
+
}
void Manager::onSettingChanged(const QString &key)