[Emacs-diffs] /srv/bzr/emacs/trunk r110749: * dbusbind.c: Fix cut'n'waste error. Use HAVE_DBUS_VALIDATE_INTERFACE.

[Michael Albinus]

------------------------------------------------------------
revno: 110749
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Wed 2012-10-31 12:45:40 +0100
message:
  * dbusbind.c: Fix cut'n'waste error.  Use HAVE_DBUS_VALIDATE_INTERFACE.
modified:
  src/ChangeLog
  src/dbusbind.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-10-31 10:02:51 +0000
+++ b/src/ChangeLog     2012-10-31 11:45:40 +0000
@@ -1,3 +1,7 @@
+2012-10-31  Michael Albinus  <address@hidden>
+
+       * dbusbind.c: Fix cut'n'waste error.  Use HAVE_DBUS_VALIDATE_INTERFACE.
+
 2012-10-31  Martin Rudalics  <address@hidden>
 
        * 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)

=== modified file 'src/dbusbind.c'
--- a/src/dbusbind.c    2012-10-15 10:10:17 +0000
+++ b/src/dbusbind.c    2012-10-31 11:45:40 +0000
@@ -299,8 +299,8 @@
       }                                                                        
\
   } 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))                                                        
\