diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2011-09-25 18:00:02 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2011-09-25 18:00:02 +0200 |
| commit | b2bf61aa89138859313b14cde43face3e5dfc44a (patch) | |
| tree | f005ba4f941afefa379663ccdcc4902ec0f1d7d3 | |
| parent | e2ee6f30ac4e3933cda1f09f74196e98d43d1d6a (diff) | |
| download | emacs-b2bf61aa89138859313b14cde43face3e5dfc44a.tar.gz | |
* dbusbind.c (Fdbus_register_signal): When service is not
registered, use nil in Vdbus_registered_objects_table. (Bug#9581)
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/dbusbind.c | 8 |
2 files changed, 6 insertions, 7 deletions
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; |