* net/dbus.el: (dbus-property-handler): Return empty array if

there are no properties.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3edff65044ab37853def6f0da5e0bea33ea0b5c6..0684afde475229ea73412e743d9a163a6116fd9f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-09  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/dbus.el: (dbus-property-handler): Return empty array if
+       there are no properties.
+
 2012-03-09  Leo Liu  <sdl.web@gmail.com>
 
        * savehist.el (savehist-printable): Stricter check for string

diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index fbc83bf1df09b97a836dce22e1915186fe6d5d46..feef78a305fe6f7ca423563b86f1f24e20c2aa51 100644 (file)
--- 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'."
                    (car (last key))
                    (list :variant (cdar (last (car val))))))))
         dbus-registered-objects-table)
-       (list result))))))
+       ;; Return the result, or an empty array.
+       (list :array (or result '(:signature "{sv}"))))))))
 
  \f
 ;; Initialize :system and :session buses.  This adds their file