X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fafm-main-plugin%2Fafm-main-plugin.c;h=f07afdb1becf3fdc20a88bdcf6d9bd536706a6a7;hb=c2560bd51498fb38e645b60ae638e2e888c74b65;hp=f6b44a0adb732c18c1133c85399d1992d345810b;hpb=a0eb62f43459f17961db16256199b4bbb936d863;p=src%2Fapp-framework-binder.git

diff --git a/plugins/afm-main-plugin/afm-main-plugin.c b/plugins/afm-main-plugin/afm-main-plugin.c
index f6b44a0a..f07afdb1 100644
--- a/plugins/afm-main-plugin/afm-main-plugin.c
+++ b/plugins/afm-main-plugin/afm-main-plugin.c
@@ -69,11 +69,6 @@ static struct json_object *embed(AFB_request *request, const char *tag, struct j
 	return result;
 }
 
-static struct json_object *call(AFB_request *request, AFB_PostItem *item, const char *tag, struct json_object *(*fun)(AFB_request*,AFB_PostItem*))
-{
-	return embed(request, tag, fun(request, item));
-}
-
 static struct json_object *call_void(AFB_request *request, AFB_PostItem *item)
 {
 	struct json_object *obj = jbus_call_sj_sync(jbus, request->api, "true");
@@ -157,7 +152,7 @@ static struct json_object *call_start(AFB_request *request, AFB_PostItem *item)
 	free(query);
 
 	/* embed if needed */
-	if (json_object_get_type(resp) == json_type_string)
+	if (json_object_get_type(resp) == json_type_int)
 		resp = embed(request, _runid_, resp);
 	request->errcode = resp ? MHD_HTTP_OK : MHD_HTTP_FAILED_DEPENDENCY;
 	return resp;
@@ -206,7 +201,7 @@ static AFB_restapi plug_apis[] =
 	{_state_    , AFB_SESSION_CHECK, (AFB_apiCB)call_runid, "Get the state of a running application"},
 	{_install_  , AFB_SESSION_CHECK, (AFB_apiCB)call_file__appid,  "Install an application using a widget file"},
 	{_uninstall_, AFB_SESSION_CHECK, (AFB_apiCB)call_appid, "Uninstall an application"},
-	{NULL}
+	{ NULL, 0, NULL, NULL }
 };
 
 static AFB_plugin plug_desc = {
@@ -218,7 +213,7 @@ static AFB_plugin plug_desc = {
 
 AFB_plugin *pluginRegister()
 {
-	jbus = create_jbus(1, "/org/AGL/afm/user");
+	jbus = create_jbus_session("/org/AGL/afm/user");
         if (jbus)
 		return &plug_desc;
 	fprintf(stderr, "ERROR: %s:%d: can't connect to DBUS session\n", __FILE__, __LINE__);