Merge from trunk.

2 files changed, 6 insertions, 7 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1769f91aaf2..ff76a9a8c78 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -767,6 +767,11 @@
         rather than rolling our own approximation.
         (SCROLL_BAR_VEC_SIZE): Remove; not used.
 
+2011-09-25  Michael Albinus  <michael.albinus@gmx.de>
+
+        * dbusbind.c (Fdbus_register_signal): When service is not
+        registered, use nil in Vdbus_registered_objects_table.  (Bug#9581)
+
 2011-09-25  Glenn Morris  <rgm@gnu.org>
 
         * buffer.c (truncate-lines): Doc fix.
diff --git a/src/dbusbind.c b/src/dbusbind.c
index 0b6d6929a4d..352f2fc1ff8 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -2071,13 +2071,7 @@ usage: (dbus-register-signal BUS SERVICE PATH INTERFACE SIGNAL HANDLER &rest ARG
       && (SBYTES (service) > 0)
       && (strcmp (SSDATA (service), DBUS_SERVICE_DBUS) != 0)
       && (strncmp (SSDATA (service), ":", 1) != 0))
-    {
-      uname = call2 (intern ("dbus-get-name-owner"), bus, service);
-      /* When there is no unique name, we mark it with an empty
-         string.  */
-      if (NILP (uname))
-        uname = empty_unibyte_string;
-    }
+    uname = call2 (intern ("dbus-get-name-owner"), bus, service);
   else
     uname = service;