From 0f63337a3d5a85c9fa1c0f316f230ce6b6619653 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 31 Oct 2012 12:45:40 +0100 Subject: [PATCH] * dbusbind.c: Fix cut'n'waste error. Use HAVE_DBUS_VALIDATE_INTERFACE. --- src/ChangeLog | 6 +++++- src/dbusbind.c | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 9f727eede2d..07aeae52055 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-10-31 Michael Albinus + + * dbusbind.c: Fix cut'n'waste error. Use HAVE_DBUS_VALIDATE_INTERFACE. + 2012-10-31 Martin Rudalics * minibuf.c (read_minibuf): Restore current buffer since @@ -6082,7 +6086,7 @@ * lisp.h (make_formatted_string): New prototype. * alloc.c (make_formatted_string): New function. * buffer.c (Fgenerate_new_buffer_name): Use it. - * dbus.c (syms_of_dbusbind): Likewise. + * dbusbind.c (syms_of_dbusbind): Likewise. * editfns.c (Fcurrent_time_zone): Likewise. * filelock.c (get_boot_time): Likewise. * frame.c (make_terminal_frame, set_term_frame_name) diff --git a/src/dbusbind.c b/src/dbusbind.c index 08f34f47042..80086946fc4 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -299,8 +299,8 @@ xd_symbol_to_dbus_type (Lisp_Object object) } \ } while (0) -#if (HAVE_DBUS_VALIDATE_BUS_NAME || HAVE_DBUS_VALIDATE_PATH \ - || XD_DBUS_VALIDATE_OBJECT || HAVE_DBUS_VALIDATE_MEMBER) +#if (HAVE_DBUS_VALIDATE_BUS_NAME || HAVE_DBUS_VALIDATE_PATH \ + || HAVE_DBUS_VALIDATE_INTERFACE || HAVE_DBUS_VALIDATE_MEMBER) #define XD_DBUS_VALIDATE_OBJECT(object, func) \ do { \ if (!NILP (object)) \ -- 2.11.4.GIT