* dbusbind.c: Fix cut'n'waste error. Use HAVE_DBUS_VALIDATE_INTERFACE.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3ad653efd0f7bd356beffc6d5af056a7bb1893f3..4edb3a7007b06f84a87e96619c37fd2e9b0ea5c7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-31  Michael Albinus  <michael.albinus@gmx.de>
+
+       * dbusbind.c: Fix cut'n'waste error.  Use HAVE_DBUS_VALIDATE_INTERFACE.
+
 2012-10-31  Martin Rudalics  <rudalics@gmx.at>
 
        * 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 08f34f470421e9ea32da4cd5868bbdddeab599e5..80086946fc4b4541574bb41b911c279dae7a2717 100644 (file)
--- 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))                                                        \