aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2009-12-12 19:18:33 +0000
committerMichael Albinus2009-12-12 19:18:33 +0000
commit31bb373f927d65a500ae94f3b19796c4e089329f (patch)
tree271b58dac1e129e5970ce2c1fe1931d62e639251
parentba68c0b0c40ba13591c26db74af281d9fb2aac32 (diff)
downloademacs-31bb373f927d65a500ae94f3b19796c4e089329f.tar.gz
emacs-31bb373f927d65a500ae94f3b19796c4e089329f.zip
* net/dbus.el (dbus-property-handler): Filter lambda forms out
when responding to "GetAll" properties.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/dbus.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 25869e3b0b0..fa6cd869ebc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12009-12-12 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/dbus.el (dbus-property-handler): Filter lambda forms out
4 when responding to "GetAll" properties.
5
12009-12-12 Chong Yidong <cyd@stupidchicken.com> 62009-12-12 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * simple.el (compose-mail): Remove mail-setup-with-from from 8 * 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'."
954 (lambda (key val) 954 (lambda (key val)
955 (when (and (equal (butlast key) (list bus interface)) 955 (when (and (equal (butlast key) (list bus interface))
956 (string-equal path (nth 2 (car val))) 956 (string-equal path (nth 2 (car val)))
957 (consp (car (last (car val))))) 957 (not (functionp (car (last (car val))))))
958 (add-to-list 958 (add-to-list
959 'result 959 'result
960 (list :dict-entry 960 (list :dict-entry