diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-09-25 14:06:35 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-09-25 14:06:35 -0700 |
| commit | 60b5d3ca2bf381f450da02e3936f7b43b7ca2dab (patch) | |
| tree | c6c6a4a25dcb51c932217f0081690539ee43a175 /src/dbusbind.c | |
| parent | 1a2f43d0db92546dab765bc947f70bc7d2e4fee0 (diff) | |
| parent | b2bf61aa89138859313b14cde43face3e5dfc44a (diff) | |
Merge from trunk.
Diffstat (limited to 'src/dbusbind.c')
| -rw-r--r-- | src/dbusbind.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/dbusbind.c b/src/dbusbind.c index 0b6d6929a4..352f2fc1ff 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; |