* net/dbus.el (dbus-list-activatable-names): Add optional argument BUS.

07e52e08 · Michael Albinus · b19beacc · 07e52e08 · 07e52e08
Commit 07e52e08 authored Feb 07, 2011 by Michael Albinus
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 4 deletions

lisp/ChangeLog lisp/ChangeLog +5 -0

lisp/net/dbus.el lisp/net/dbus.el +5 -4

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+2011-02-07  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/dbus.el (dbus-list-activatable-names): Add optional argument
+	BUS.
+
 2011-02-07  Deniz Dogan  <deniz.a.m.dogan@gmail.com>
  
 	* net/rcirc.el (rcirc-handler-317): New function (Bug#6507).

--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -506,13 +506,14 @@ well formed."

 ;;; D-Bus registered names.

-(defun dbus-list-activatable-names ()
+(defun dbus-list-activatable-names (&optional bus)
  "Return the D-Bus service names which can be activated as list.
-The result is a list of strings, which is `nil' when there are no
-activatable service names at all."
+If BUS is left nil, `:system' is assumed.  The result is a list
+of strings, which is `nil' when there are no activatable service
+names at all."
  (dbus-ignore-errors
    (dbus-call-method
-     :system dbus-service-dbus
+     (or bus :system) dbus-service-dbus
     dbus-path-dbus dbus-interface-dbus "ListActivatableNames")))

 (defun dbus-list-names (bus)