X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdbus.h;h=af837f283f8f86a3cb582237c123ce52c4a67e33;hp=264bdff6258dec8c9eb65904e17dde892248779c;hb=5e8d1c9a9f15b7453474dc4879bdb4021c3f50a1;hpb=f9704703f35a281d9f8fa12018bd396b2be30d36 diff --git a/src/dbus.h b/src/dbus.h index 264bdff62..af837f283 100644 --- a/src/dbus.h +++ b/src/dbus.h @@ -56,10 +56,8 @@ typedef struct BusProperty { " \n" \ " \n" -int bus_init_system(Manager *m); -int bus_init_api(Manager *m); -void bus_done_system(Manager *m); -void bus_done_api(Manager *m); +int bus_init(Manager *m); +void bus_done(Manager *m); unsigned bus_dispatch(Manager *m); @@ -68,9 +66,10 @@ void bus_timeout_event(Manager *m, Watch *w, int events); int bus_query_pid(Manager *m, const char *name); -DBusHandlerResult bus_default_message_handler(Manager *m, DBusMessage *message, const char* introspection, const BusProperty *properties); +DBusHandlerResult bus_default_message_handler(Manager *m, DBusConnection *c, DBusMessage *message, const char* introspection, const BusProperty *properties); +DBusHandlerResult bus_send_error_reply(Manager *m, DBusConnection *c, DBusMessage *message, DBusError *bus_error, int error); -DBusHandlerResult bus_send_error_reply(Manager *m, DBusMessage *message, DBusError *bus_error, int error); +int bus_broadcast(Manager *m, DBusMessage *message); int bus_property_append_string(Manager *m, DBusMessageIter *i, const char *property, void *data); int bus_property_append_strv(Manager *m, DBusMessageIter *i, const char *property, void *data);