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 @@
+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 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'."
                     (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}"))))))))
 
  
 ;; Initialize :system and :session buses.  This adds their file