renaming of field api

[src/app-framework-binder.git] / plugins / afm-main-plugin / afm-main-plugin.c

diff --git a/plugins/afm-main-plugin/afm-main-plugin.c b/plugins/afm-main-plugin/afm-main-plugin.c
index f6b44a0..0b6b868 100644 (file)
--- a/plugins/afm-main-plugin/afm-main-plugin.c
+++ b/plugins/afm-main-plugin/afm-main-plugin.c
@@ -69,14 +69,9 @@ 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");
+       struct json_object *obj = jbus_call_sj_sync(jbus, request->method, "true");
        if (verbose)
                fprintf(stderr, "(afm-main-plugin) call_void: true -> %s\n", obj ? json_object_to_json_string(obj) : "NULL");
        request->errcode = obj ? MHD_HTTP_OK : MHD_HTTP_FAILED_DEPENDENCY;
@@ -96,7 +91,7 @@ static struct json_object *call_appid(AFB_request *request, AFB_PostItem *item)
                request->errcode = MHD_HTTP_INTERNAL_SERVER_ERROR;
                return NULL;
        }
-       obj = jbus_call_sj_sync(jbus, request->api, sid);
+       obj = jbus_call_sj_sync(jbus, request->method, sid);
        if (verbose)
                fprintf(stderr, "(afm-main-plugin) call_appid: %s -> %s\n", sid, obj ? json_object_to_json_string(obj) : "NULL");
        free(sid);
@@ -112,7 +107,7 @@ static struct json_object *call_runid(AFB_request *request, AFB_PostItem *item)
                request->errcode = MHD_HTTP_BAD_REQUEST;
                return NULL;
        }
-       obj = jbus_call_sj_sync(jbus, request->api, id);
+       obj = jbus_call_sj_sync(jbus, request->method, id);
        if (verbose)
                fprintf(stderr, "(afm-main-plugin) call_runid: %s -> %s\n", id, obj ? json_object_to_json_string(obj) : "NULL");
        request->errcode = obj ? MHD_HTTP_OK : MHD_HTTP_FAILED_DEPENDENCY;
@@ -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;
@@ -179,7 +174,7 @@ static struct json_object *call_file__appid(AFB_request *request, AFB_PostItem *
                        if (0 >= asprintf(&query, "\"%s\"", filename))
                                request->errcode = MHD_HTTP_INTERNAL_SERVER_ERROR;
                        else {
-                               obj = jbus_call_sj_sync(jbus, request->api, query);
+                               obj = jbus_call_sj_sync(jbus, request->method, query);
                                if (verbose)
                                        fprintf(stderr, "(afm-main-plugin) call_file_appid: %s -> %s\n", query, obj ? json_object_to_json_string(obj) : "NULL");
                                free(query);
@@ -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__);