diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
| commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
| tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /lisp/net/dbus.el | |
| parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
| parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
| download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz | |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/net/dbus.el')
| -rw-r--r-- | lisp/net/dbus.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index a9de35c814f..4116d293e1b 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -1144,6 +1144,7 @@ compound type arguments (TYPE VALUE) will be kept as is." EVENT is a D-Bus event, see `dbus-check-event'. HANDLER, being part of the event, is called with arguments ARGS (without type information). If the HANDLER returns a `dbus-error', it is propagated as return message." + (declare (completion ignore)) (interactive "e") (condition-case err (let (monitor args result) @@ -2028,8 +2029,9 @@ either a method name, a signal name, or an error name." ",") rule (or rule "")) - (unless (ignore-errors (dbus-get-unique-name bus-private)) - (dbus-init-bus bus 'private)) + (when (fboundp 'dbus-get-unique-name) + (unless (ignore-errors (dbus-get-unique-name bus-private)) + (dbus-init-bus bus 'private))) (dbus-call-method bus-private dbus-service-dbus dbus-path-dbus dbus-interface-monitoring "BecomeMonitor" `(:array :string ,rule) :uint32 0) |