Merge remote-tracking branch 'javispedro/js-testing'

Conflicts:
	daemon/daemon.pro
	daemon/dbusconnector.cpp
	daemon/manager.cpp
	daemon/watchcommands.cpp
	daemon/watchcommands.h
	daemon/watchconnector.cpp
	daemon/watchconnector.h
	log4qt-debug.conf
	log4qt-release.conf
	rpm/pebble.spec
	rpm/pebble.yaml

1 files changed, 1 insertions, 26 deletions

diff --git a/daemon/dbusconnector.cpp b/daemon/dbusconnector.cpp
index 4827b1f..197a12f 100644
--- a/daemon/dbusconnector.cpp
+++ b/daemon/dbusconnector.cpp
@@ -6,7 +6,6 @@
 #include <QDBusReply>
 #include <QDBusArgument>
 #include <QDBusObjectPath>
-#include <QDBusConnectionInterface>
 
 //dbus-send --system --dest=org.bluez --print-reply / org.bluez.Manager.ListAdapters
 //dbus-send --system --dest=org.bluez --print-reply $path org.bluez.Adapter.GetProperties
@@ -15,19 +14,7 @@
 
 DBusConnector::DBusConnector(QObject *parent) :
     QObject(parent), l(metaObject()->className())
-{
-    QDBusConnectionInterface *interface = QDBusConnection::sessionBus().interface();
-
-    QDBusReply<QStringList> serviceNames = interface->registeredServiceNames();
-    if (serviceNames.isValid()) {
-        dbusServices = serviceNames.value();
-    }
-    else {
-        qCCritical(l) << serviceNames.error().message();
-    }
-    connect(interface, SIGNAL(serviceRegistered(const QString &)), SLOT(onServiceRegistered(const QString &)));
-    connect(interface, SIGNAL(serviceUnregistered(const QString &)), SLOT(onServiceUnregistered(const QString &)));
-}
+{}
 
 bool DBusConnector::findPebble()
 {
@@ -82,15 +69,3 @@ bool DBusConnector::findPebble()
 
     return false;
 }
-
-void DBusConnector::onServiceRegistered(const QString &name)
-{
-    qCDebug(l) << "DBus service online:" << name;
-    if (!dbusServices.contains(name)) dbusServices.append(name);
-}
-
-void DBusConnector::onServiceUnregistered(const QString &name)
-{
-    qCDebug(l) << "DBus service offline:" << name;
-    if (dbusServices.contains(name)) dbusServices.removeAll(name);
-}