aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2012-03-09 23:06:09 +0100
committerMichael Albinus2012-03-09 23:06:09 +0100
commit052e28acfcae37d8108fa195890482cc7f2ddaa1 (patch)
treed6429d940c5b985eaf9b2d5cb644800c043ae57c
parent95d5e396e280d96e4b1ba0fc222992b6661b0572 (diff)
downloademacs-052e28acfcae37d8108fa195890482cc7f2ddaa1.tar.gz
emacs-052e28acfcae37d8108fa195890482cc7f2ddaa1.zip
* net/dbus.el: (dbus-property-handler): Return empty array if
there are no properties.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/dbus.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3edff65044a..0684afde475 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-03-09 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/dbus.el: (dbus-property-handler): Return empty array if
4 there are no properties.
5
12012-03-09 Leo Liu <sdl.web@gmail.com> 62012-03-09 Leo Liu <sdl.web@gmail.com>
2 7
3 * savehist.el (savehist-printable): Stricter check for string 8 * savehist.el (savehist-printable): Stricter check for string
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index fbc83bf1df0..feef78a305f 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -1039,7 +1039,8 @@ It will be registered for all objects created by `dbus-register-object'."
1039 (car (last key)) 1039 (car (last key))
1040 (list :variant (cdar (last (car val)))))))) 1040 (list :variant (cdar (last (car val))))))))
1041 dbus-registered-objects-table) 1041 dbus-registered-objects-table)
1042 (list result)))))) 1042 ;; Return the result, or an empty array.
1043 (list :array (or result '(:signature "{sv}"))))))))
1043 1044
1044 1045
1045;; Initialize :system and :session buses. This adds their file 1046;; Initialize :system and :session buses. This adds their file