aboutsummaryrefslogtreecommitdiffstats
path: root/src/dbusbind.c
diff options
context:
space:
mode:
authorMichael Albinus2011-09-25 18:00:02 +0200
committerMichael Albinus2011-09-25 18:00:02 +0200
commitb2bf61aa89138859313b14cde43face3e5dfc44a (patch)
treef005ba4f941afefa379663ccdcc4902ec0f1d7d3 /src/dbusbind.c
parente2ee6f30ac4e3933cda1f09f74196e98d43d1d6a (diff)
downloademacs-b2bf61aa89138859313b14cde43face3e5dfc44a.tar.gz
emacs-b2bf61aa89138859313b14cde43face3e5dfc44a.zip
* dbusbind.c (Fdbus_register_signal): When service is not
registered, use nil in Vdbus_registered_objects_table. (Bug#9581)
Diffstat (limited to 'src/dbusbind.c')
-rw-r--r--src/dbusbind.c8
1 files changed, 1 insertions, 7 deletions
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
2071 && (SBYTES (service) > 0) 2071 && (SBYTES (service) > 0)
2072 && (strcmp (SSDATA (service), DBUS_SERVICE_DBUS) != 0) 2072 && (strcmp (SSDATA (service), DBUS_SERVICE_DBUS) != 0)
2073 && (strncmp (SSDATA (service), ":", 1) != 0)) 2073 && (strncmp (SSDATA (service), ":", 1) != 0))
2074 { 2074 uname = call2 (intern ("dbus-get-name-owner"), bus, service);
2075 uname = call2 (intern ("dbus-get-name-owner"), bus, service);
2076 /* When there is no unique name, we mark it with an empty
2077 string. */
2078 if (NILP (uname))
2079 uname = empty_unibyte_string;
2080 }
2081 else 2075 else
2082 uname = service; 2076 uname = service;
2083 2077