diff --git a/guh.pri b/guh.pri index 3edc6234..f5fa9dd9 100644 --- a/guh.pri +++ b/guh.pri @@ -2,7 +2,7 @@ GUH_VERSION_STRING=$$system('dpkg-parsechangelog | sed -n -e "s/^Version: //p"') # define JSON protocol version -JSON_PROTOCOL_VERSION=23 +JSON_PROTOCOL_VERSION=24 DEFINES += GUH_VERSION_STRING=\\\"$${GUH_VERSION_STRING}\\\" JSON_PROTOCOL_VERSION=\\\"$${JSON_PROTOCOL_VERSION}\\\" diff --git a/server/jsonrpc/ruleshandler.cpp b/server/jsonrpc/ruleshandler.cpp index 0e838d32..8f59a8ae 100644 --- a/server/jsonrpc/ruleshandler.cpp +++ b/server/jsonrpc/ruleshandler.cpp @@ -56,7 +56,6 @@ RulesHandler::RulesHandler(QObject *parent) : params.insert("o:stateEvaluator", JsonTypes::stateEvaluatorRef()); params.insert("o:exitActions", QVariantList() << JsonTypes::ruleActionRef()); params.insert("o:enabled", JsonTypes::basicTypeToString(JsonTypes::Bool)); - params.insert("o:active", JsonTypes::basicTypeToString(JsonTypes::Bool)); params.insert("name", JsonTypes::basicTypeToString(JsonTypes::String)); QVariantList actions; actions.append(JsonTypes::ruleActionRef()); diff --git a/tests/auto/api.json b/tests/auto/api.json index f870ad2b..3dd20922 100644 --- a/tests/auto/api.json +++ b/tests/auto/api.json @@ -293,7 +293,6 @@ "$ref:RuleAction" ], "name": "String", - "o:active": "Bool", "o:enabled": "Bool", "o:eventDescriptor": "$ref:EventDescriptor", "o:eventDescriptorList": [