From abfae2b6d73d7be40ffbff8e8429f71d82df90b5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Bollo?= Date: Wed, 16 Mar 2016 16:06:09 +0100 Subject: [PATCH] afm-user-daemon: use new closure behaviour MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I67b4904251d2525ff98c3fcf7803880eab7e6db4 Signed-off-by: José Bollo --- src/afm-user-daemon.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/afm-user-daemon.c b/src/afm-user-daemon.c index cbb51e5..2b7ec7a 100644 --- a/src/afm-user-daemon.c +++ b/src/afm-user-daemon.c @@ -334,6 +334,7 @@ static void propagate(struct jreq *jreq, const char *msg, const char *method) jbus_reply_error_s(jreq, error_system); } +#if defined(EXPLICIT_CALL) /* * On query "install" from 'jreq' with parameters of 'msg'. */ @@ -349,6 +350,7 @@ static void on_uninstall(struct jreq *jreq, const char *msg, void *unused) { return propagate(jreq, msg, "uninstall"); } +#endif /* * On system signaling that applications list changed @@ -502,8 +504,13 @@ int main(int ac, char **av) || jbus_add_service_j(user_bus, "continue", on_continue, NULL) || jbus_add_service_j(user_bus, "runners", on_runners, NULL) || jbus_add_service_j(user_bus, "state", on_state, NULL) +#if defined(EXPLICIT_CALL) || jbus_add_service_s(user_bus, "install", on_install, NULL) || jbus_add_service_s(user_bus, "uninstall", on_uninstall, NULL)) { +#else + || jbus_add_service_s(user_bus, "install", (void (*)(struct jreq *, const char *, void *))propagate, "install") + || jbus_add_service_s(user_bus, "uninstall", (void (*)(struct jreq *, const char *, void *))propagate, "uninstall")) { +#endif ERROR("adding services failed"); return 1; } -- 2.16.6