From: Michael Albinus <michael.albinus@gmx.de>
Date: Tue, 20 May 2014 08:25:18 +0000 (+0200)
Subject: * dbusbind.c (xd_signature): Revert last 2 patches.
X-Git-Tag: emacs-25.0.90~2640^2~78
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a05affb23880007ad0b00acb7e9a37c2988703d0;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 5cea85350b7..0ca3deaec9c 100644
--- 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 9e15d7f199a..8997e01b068 100644
--- 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;