diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2013-12-04 11:10:06 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-01-29 15:28:58 -0800 |
| commit | 480590b90c3966536451d2a2fecc42a66082ed77 (patch) | |
| tree | f15da948f18ee8748010a2a6f7ab1d3304d144fc /config/hal.c | |
| parent | c29454ae9d2e8e647732077fdfd97b351095f122 (diff) | |
dbus-core: Make dbus-core no longer mutually exclusive with udev
With systemd-logind the dbus-core will be used for more then just config, so
it should be possible to build it even when using a non dbus dependent config
backend.
This patch also removes the config_ prefix from the dbus-core symbols.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'config/hal.c')
| -rw-r--r-- | config/hal.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config/hal.c b/config/hal.c index 2ead556b0..94cb6e7cd 100644 --- a/config/hal.c +++ b/config/hal.c @@ -33,6 +33,7 @@ #include <string.h> #include <sys/select.h> +#include "dbus-core.h" #include "input.h" #include "inputstr.h" #include "hotplug.h" @@ -631,7 +632,7 @@ connect_hook(DBusConnection * connection, void *data) static struct config_hal_info hal_info; -static struct config_dbus_core_hook hook = { +static struct dbus_core_hook hook = { .connect = connect_hook, .disconnect = disconnect_hook, .data = &hal_info, @@ -644,7 +645,7 @@ config_hal_init(void) hal_info.system_bus = NULL; hal_info.hal_ctx = NULL; - if (!config_dbus_core_add_hook(&hook)) { + if (!dbus_core_add_hook(&hook)) { LogMessage(X_ERROR, "config/hal: failed to add D-Bus hook\n"); return 0; } @@ -658,5 +659,5 @@ config_hal_init(void) void config_hal_fini(void) { - config_dbus_core_remove_hook(&hook); + dbus_core_remove_hook(&hook); } |