From 0f6b4cc536e341ffa5f45e06844d52cc1a7af425 Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Tue, 19 Dec 2017 20:59:01 +0100
Subject: Bulk of small fixes

Correctly grab lua script using simpler prefix
Correctly free Composer object's members
Adding default binding source as required-apis

Change-Id: I91d34b636286e79c7bcc27f8ba2730897ec5f424
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---
 conf.d/project/lua.d/signal-composer-daemon-04-oncall.lua | 8 --------
 conf.d/wgt/config.xml.in                                  | 2 ++
 ctl-utilities                                             | 2 +-
 signal-composer-binding/signal-composer.cpp               | 4 ++--
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/conf.d/project/lua.d/signal-composer-daemon-04-oncall.lua b/conf.d/project/lua.d/signal-composer-daemon-04-oncall.lua
index 0295b6d..9d31f25 100644
--- a/conf.d/project/lua.d/signal-composer-daemon-04-oncall.lua
+++ b/conf.d/project/lua.d/signal-composer-daemon-04-oncall.lua
@@ -75,14 +75,6 @@ function _Simple_Echo_Args (source, args, event)
     print ("--inlua-- source=", Dump_Table(source))
     print ("--inlua-- args=", Dump_Table(args))
     print ("--inlua-- event=", Dump_Table(event))
-
-    local response={
-       ["count"]=_count,
-       ["args"]=args,
-    }
-
-    -- fulup Embdeded table ToeDone AFB:success (request, response)
-    -- AFB:success (request, response)
 end
 
 local function Test_Async_CB (request, result, context)
diff --git a/conf.d/wgt/config.xml.in b/conf.d/wgt/config.xml.in
index 574c388..e72a08e 100644
--- a/conf.d/wgt/config.xml.in
+++ b/conf.d/wgt/config.xml.in
@@ -18,6 +18,8 @@
 
 	<feature name="urn:AGL:widget:required-api">
 		<param name="lib/afb-signal-composer.so" value="local" />
+		<param name="low-can" value="ws" />
+		<param name="gps" value="ws" />
 	</feature>
 
 	<feature name="urn:AGL:widget:file-properties">
diff --git a/ctl-utilities b/ctl-utilities
index d77db1a..691ddfc 160000
--- a/ctl-utilities
+++ b/ctl-utilities
@@ -1 +1 @@
-Subproject commit d77db1aa4f4ea93d5fc019ccee0bba90183ffc19
+Subproject commit 691ddfcb45a6ff32a822372acaac5197be7d7b7c
diff --git a/signal-composer-binding/signal-composer.cpp b/signal-composer-binding/signal-composer.cpp
index 83a2b9f..fa565cb 100644
--- a/signal-composer-binding/signal-composer.cpp
+++ b/signal-composer-binding/signal-composer.cpp
@@ -93,8 +93,8 @@ Composer::~Composer()
 	{
 		json_object_put(j);
 	}
-	json_object_put(ctlConfig_->configJ);
-	json_object_put(ctlConfig_->requireJ);
+	if (ctlConfig_->configJ) json_object_put(ctlConfig_->configJ);
+	if (ctlConfig_->requireJ)json_object_put(ctlConfig_->requireJ);
 	free(ctlConfig_);
 }
 
-- 
cgit 1.2.3-korg