[Emacs-diffs] /srv/bzr/emacs/trunk r105922: * dbusbind.c (Fdbus_register_signal): When service is not

[Michael Albinus]

------------------------------------------------------------
revno: 105922
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sun 2011-09-25 18:00:02 +0200
message:
  * dbusbind.c (Fdbus_register_signal): When service is not
  registered, use nil in Vdbus_registered_objects_table.  (Bug#9581)
modified:
  src/ChangeLog
  src/dbusbind.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-09-25 02:30:31 +0000
+++ b/src/ChangeLog     2011-09-25 16:00:02 +0000
@@ -1,3 +1,8 @@
+2011-09-25  Michael Albinus  <address@hidden>
+
+       * dbusbind.c (Fdbus_register_signal): When service is not
+       registered, use nil in Vdbus_registered_objects_table.  (Bug#9581)
+
 2011-09-25  Glenn Morris  <address@hidden>
 
        * buffer.c (truncate-lines): Doc fix.

=== modified file 'src/dbusbind.c'
--- a/src/dbusbind.c    2011-09-24 11:36:53 +0000
+++ b/src/dbusbind.c    2011-09-25 16:00:02 +0000
@@ -2071,13 +2071,7 @@
       && (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;