From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 25 Sep 2011 16:00:02 +0000 (+0200)
Subject: * dbusbind.c (Fdbus_register_signal): When service is not
X-Git-Tag: emacs-pretest-24.0.90~2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b2bf61aa89138859313b14cde43face3e5dfc44a;p=emacs.git

* dbusbind.c (Fdbus_register_signal): When service is not
registered, use nil in Vdbus_registered_objects_table.  (Bug#9581)
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 5c51023211b..3282654ab06 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+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 14c1621e0ee..52e08d8ee2a 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;