From 33e64038fa05b8bef2bf13268246e6f31c63420c Mon Sep 17 00:00:00 2001
From: Michael Zanetti <mzanetti@kde.org>
Date: Mon, 14 Apr 2014 00:16:08 +0200
Subject: [PATCH] fix discovery response in json

---
 server/jsonrpc/devicehandler.cpp | 1 +
 server/jsonrpc/jsontypes.cpp     | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/server/jsonrpc/devicehandler.cpp b/server/jsonrpc/devicehandler.cpp
index fd9d8452..b49c4536 100644
--- a/server/jsonrpc/devicehandler.cpp
+++ b/server/jsonrpc/devicehandler.cpp
@@ -154,6 +154,7 @@ DeviceHandler::DeviceHandler(QObject *parent) :
     setParams("StateChanged", params);
 
     connect(GuhCore::instance()->deviceManager(), &DeviceManager::deviceStateChanged, this, &DeviceHandler::deviceStateChanged);
+    connect(GuhCore::instance()->deviceManager(), &DeviceManager::devicesDiscovered, this, &DeviceHandler::devicesDiscovered);
 }
 
 QString DeviceHandler::name() const
diff --git a/server/jsonrpc/jsontypes.cpp b/server/jsonrpc/jsontypes.cpp
index aa59671f..67ac02f6 100644
--- a/server/jsonrpc/jsontypes.cpp
+++ b/server/jsonrpc/jsontypes.cpp
@@ -396,6 +396,12 @@ QPair<bool, QString> JsonTypes::validateVariant(const QVariant &templateVariant,
                     qDebug() << "device not valid";
                     return result;
                 }
+            } else if (refName == deviceDescriptorRef()) {
+                QPair<bool, QString> result = validateMap(deviceDescriptorDescription(), variant.toMap());
+                if (!result.first) {
+                    qDebug() << "devicedescription not valid";
+                    return result;
+                }
             } else if (refName == vendorRef()) {
                 QPair<bool, QString> result = validateMap(vendorDescription(), variant.toMap());
                 if (!result.first) {