chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journald: start the journal after the syslog socket, so that the syslog socket queues...
[elogind.git]
/
src
/
dbus-automount.c
diff --git
a/src/dbus-automount.c
b/src/dbus-automount.c
index 3bccb4e5f735df83e46679a6d03d5276178f7c13..826842560d0f6816b9b8d0aad1c9752c161e4226 100644
(file)
--- a/
src/dbus-automount.c
+++ b/
src/dbus-automount.c
@@
-21,6
+21,7
@@
#include "dbus-unit.h"
#include "dbus-automount.h"
#include "dbus-unit.h"
#include "dbus-automount.h"
+#include "dbus-common.h"
#define BUS_AUTOMOUNT_INTERFACE \
" <interface name=\"org.freedesktop.systemd1.Automount\">\n" \
#define BUS_AUTOMOUNT_INTERFACE \
" <interface name=\"org.freedesktop.systemd1.Automount\">\n" \
@@
-38,7
+39,11
@@
BUS_INTROSPECTABLE_INTERFACE \
"</node>\n"
BUS_INTROSPECTABLE_INTERFACE \
"</node>\n"
-const char bus_automount_interface[] = BUS_AUTOMOUNT_INTERFACE;
+#define INTERFACES_LIST \
+ BUS_UNIT_INTERFACES_LIST \
+ "org.freedesktop.systemd1.Automount\0"
+
+const char bus_automount_interface[] _introspect_("Automount") = BUS_AUTOMOUNT_INTERFACE;
DBusHandlerResult bus_automount_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
const BusProperty properties[] = {
DBusHandlerResult bus_automount_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
const BusProperty properties[] = {
@@
-48,5
+53,5
@@
DBusHandlerResult bus_automount_message_handler(Unit *u, DBusConnection *c, DBus
{ NULL, NULL, NULL, NULL, NULL }
};
{ NULL, NULL, NULL, NULL, NULL }
};
- return bus_default_message_handler(
u->meta.manager, c, message, INTROSPECTION
, properties);
+ return bus_default_message_handler(
c, message, INTROSPECTION, INTERFACES_LIST
, properties);
}
}