From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 12 Dec 2009 19:18:33 +0000 (+0000)
Subject: * net/dbus.el (dbus-property-handler): Filter lambda forms out
X-Git-Tag: emacs-pretest-23.1.91~108
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=31bb373f927d65a500ae94f3b19796c4e089329f;p=emacs.git

* net/dbus.el (dbus-property-handler): Filter lambda forms out
when responding to "GetAll" properties.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 25869e3b0b0..fa6cd869ebc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-12  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/dbus.el (dbus-property-handler): Filter lambda forms out
+	when responding to "GetAll" properties.
+
 2009-12-12  Chong Yidong  <cyd@stupidchicken.com>
 
 	* simple.el (compose-mail): Remove mail-setup-with-from from
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 49abca0ac38..2a1bd043080 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -954,7 +954,7 @@ It will be registered for all objects created by `dbus-register-object'."
 	 (lambda (key val)
 	   (when (and (equal (butlast key) (list bus interface))
 		      (string-equal path (nth 2 (car val)))
-		      (consp (car (last (car val)))))
+		      (not (functionp (car (last (car val))))))
 	     (add-to-list
 	      'result
 	      (list :dict-entry