From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 7 Feb 2011 08:01:15 +0000 (+0100)
Subject: * net/dbus.el (dbus-list-activatable-names): Add optional argument BUS.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~977
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=07e52e08b0f120da48c8cd8e6e5bb4ef47f4ec38;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 40f91cfee7e..8d4a82ea8cc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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).
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 43215003ef7..05c7af2a8c3 100644
--- 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)