-extern int jbus_reply_s(struct jreq *jreq, const char *reply);
-extern int jbus_reply_j(struct jreq *jreq, struct json_object *reply);
-extern int jbus_reply_error_s(struct jreq *jreq, const char *reply);
-extern int jbus_reply_error_j(struct jreq *jreq, struct json_object *reply);
-
-extern int jbus_add_service_s(struct jbus *jbus, const char *method, void (*oncall)(struct jreq *, const char *));
-extern int jbus_add_service_j(struct jbus *jbus, const char *method, void (*oncall)(struct jreq *, struct json_object *));
-extern int jbus_start_serving(struct jbus *jbus);
-extern int jbus_send_signal_s(struct jbus *jbus, const char *name, const char *content);
-extern int jbus_send_signal_j(struct jbus *jbus, const char *name, struct json_object *content);
+extern int jbus_reply_s(
+ struct sd_bus_message *smsg,
+ const char *reply);
+
+extern int jbus_reply_j(
+ struct sd_bus_message *smsg,
+ struct json_object *reply);
+
+extern int jbus_reply_error_s(
+ struct sd_bus_message *smsg,
+ const char *reply);
+
+extern int jbus_reply_error_j(
+ struct sd_bus_message *smsg,
+ struct json_object *reply);
+
+extern int jbus_add_service_s(
+ struct jbus *jbus,
+ const char *method,
+ void (*oncall) (struct sd_bus_message *, const char *, void *),
+ void *data);
+
+extern int jbus_add_service_j(
+ struct jbus *jbus,
+ const char *method,
+ void (*oncall) (struct sd_bus_message *, struct json_object *, void *),
+ void *data);
+
+extern int jbus_start_serving(
+ struct jbus *jbus);
+
+extern int jbus_send_signal_s(
+ struct jbus *jbus,
+ const char *name,
+ const char *content);
+
+extern int jbus_send_signal_j(
+ struct jbus *jbus,
+ const char *name,
+ struct json_object *content);
+