X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/f036e167feaf875873636972b28a4adc12c32254..b6964cb031b5aa25c34b06ba77540ab06fab2005:/lisp/net/dbus.el

diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index 66170dafef..b2c1ba883a 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -1,6 +1,6 @@
 ;;; dbus.el --- Elisp bindings for D-Bus.
 
-;; Copyright (C) 2007-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2015 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, hardware
@@ -544,6 +544,10 @@ placed in the queue.
 
 `:already-owner': Service is already the primary owner."
 
+  ;; Add Peer handler.
+  (dbus-register-method
+   bus service nil dbus-interface-peer "Ping" 'dbus-peer-handler 'dont-register)
+
   ;; Add ObjectManager handler.
   (dbus-register-method
    bus service nil dbus-interface-objectmanager "GetManagedObjects"
@@ -703,7 +707,8 @@ Example:
 		 (setq counter (match-string 2 (symbol-name key))
 		       args (cdr args)
 		       value (car args))
-		 (unless (and (<= counter 63) (stringp value))
+		 (unless (and (<= (string-to-number counter) 63)
+			      (stringp value))
 		   (signal 'wrong-type-argument
 			   (list "Wrong argument" key value)))
 		 (format
@@ -1151,6 +1156,22 @@ apply
 	  bus service dbus-path-dbus dbus-interface-peer "Ping")))
     (dbus-error nil)))
 
+(defun dbus-peer-handler ()
+  "Default handler for the \"org.freedesktop.DBus.Peer\" interface.
+It will be registered for all objects created by `dbus-register-service'."
+  (let* ((last-input-event last-input-event)
+	 (method (dbus-event-member-name last-input-event)))
+    (cond
+     ;; "Ping" does not return an output parameter.
+     ((string-equal method "Ping")
+      :ignore)
+     ;; "GetMachineId" returns "s".
+     ((string-equal method "GetMachineId")
+      (signal
+       'dbus-error
+       (list
+	(format "%s.GetMachineId not implemented" dbus-interface-peer)))))))
+
 
 ;;; D-Bus introspection.
 
@@ -1672,7 +1693,7 @@ and \"org.freedesktop.DBus.Properties.GetAll\", which is slow."
 
 (defun dbus-managed-objects-handler ()
   "Default handler for the \"org.freedesktop.DBus.ObjectManager\" interface.
-It will be registered for all objects created by `dbus-register-method'."
+It will be registered for all objects created by `dbus-register-service'."
   (let* ((last-input-event last-input-event)
 	 (bus (dbus-event-bus-name last-input-event))
 	 (path (dbus-event-path-name last-input-event)))