diff options
| author | marha <marha@users.sourceforge.net> | 2014-02-07 23:46:30 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-02-07 23:46:30 +0100 |
| commit | 6daf40f6b1138efad98dbb579cd35520cbc349bb (patch) | |
| tree | 7f45dbb347f5e1a73b18a720633b9d801c968490 /xorg-server/config/hal.c | |
| parent | 5c64f94cf4cf8457a5616fe20b9a27174895f1a8 (diff) | |
| parent | 982ac918afe6a1c02d5cf735d7b6c56443a048cc (diff) | |
| download | vcxsrv-6daf40f6b1138efad98dbb579cd35520cbc349bb.tar.gz vcxsrv-6daf40f6b1138efad98dbb579cd35520cbc349bb.tar.bz2 vcxsrv-6daf40f6b1138efad98dbb579cd35520cbc349bb.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014
Conflicts:
mesalib/src/glsl/glcpp/glcpp.c
openssl/Makefile
Diffstat (limited to 'xorg-server/config/hal.c')
| -rw-r--r-- | xorg-server/config/hal.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xorg-server/config/hal.c b/xorg-server/config/hal.c index 2ead556b0..94cb6e7cd 100644 --- a/xorg-server/config/hal.c +++ b/xorg-server/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); } |