Remove mentions of GNOME MediaKeys from dbus documentation examples

* doc/misc/dbus.texi (Properties and Annotations):
* lisp/net/dbus.el (dbus-get-all-managed-objects): Remove
mentions of obsolete GNOME APIs from example text.

diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi
index 0b4f53ba136dc5681ea333042b048efd9d2567ae..bb97446d1276b3256f3f36c5d60985993b6ed8cd 100644 (file)
--- a/doc/misc/dbus.texi
+++ b/doc/misc/dbus.texi
@@ -795,13 +795,7 @@ and interface.  Example:
 (dbus-get-all-managed-objects
  :session "org.gnome.SettingsDaemon" "/")
 
-@result{} (("/org/gnome/SettingsDaemon/MediaKeys"
-     ("org.gnome.SettingsDaemon.MediaKeys")
-     ("org.freedesktop.DBus.Peer")
-     ("org.freedesktop.DBus.Introspectable")
-     ("org.freedesktop.DBus.Properties")
-     ("org.freedesktop.DBus.ObjectManager"))
-    ("/org/gnome/SettingsDaemon/Power"
+@result{} (("/org/gnome/SettingsDaemon/Power"
      ("org.gnome.SettingsDaemon.Power.Keyboard")
      ("org.gnome.SettingsDaemon.Power.Screen")
      ("org.gnome.SettingsDaemon.Power"

diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 6a8bf879671ceffddd6ad231f1d9405ee7bedf18..d4d4ed54e909f091b70ab6e4c648df4ca1c0f4b4 100644 (file)
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -1871,13 +1871,7 @@ name and cdr is the list of properties as returned by
 
 \(dbus-get-all-managed-objects :session \"org.gnome.SettingsDaemon\" \"/\")
 
-  => ((\"/org/gnome/SettingsDaemon/MediaKeys\"
-       (\"org.gnome.SettingsDaemon.MediaKeys\")
-       (\"org.freedesktop.DBus.Peer\")
-       (\"org.freedesktop.DBus.Introspectable\")
-       (\"org.freedesktop.DBus.Properties\")
-       (\"org.freedesktop.DBus.ObjectManager\"))
-      (\"/org/gnome/SettingsDaemon/Power\"
+  => ((\"/org/gnome/SettingsDaemon/Power\"
        (\"org.gnome.SettingsDaemon.Power.Keyboard\")
        (\"org.gnome.SettingsDaemon.Power.Screen\")
        (\"org.gnome.SettingsDaemon.Power\"