* dbusbind.c (xd_signature): Revert last 2 patches.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5cea85350b7016c8eb0992151efb357f3f942cff..0ca3deaec9c1a79de0ed21f38462111ee2e5a282 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-20  Michael Albinus  <michael.albinus@gmx.de>
+
+       * dbusbind.c (xd_signature): Revert last 2 patches.
+
 2014-05-19  Paul Eggert  <eggert@cs.ucla.edu>
 
        Allow any non-nil value to count as true in bool-vector.

diff --git a/src/dbusbind.c b/src/dbusbind.c
index 9e15d7f199a8b0272936d4b48d66fbbc6ed1077b..8997e01b068881387ac2446d2d558db60b0e8b08 100644 (file)
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -387,8 +387,8 @@ xd_signature (char *signature, int dtype, int parent_type, Lisp_Object object)
       break;
 
     case DBUS_TYPE_BOOLEAN:
-      /* Every Emacs Lisp object serves as a boolean, so there's nothing
-        to check.  */
+      if (!EQ (object, Qt) && !EQ (object, Qnil))
+       wrong_type_argument (intern ("booleanp"), object);
       sprintf (signature, "%c", dtype);
       break;