[Emacs-diffs] /srv/bzr/emacs/trunk r99578: * net/dbus.el (dbus-introspect, dbus-get-property)

[Michael Albinus]

------------------------------------------------------------
revno: 99578
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sun 2010-02-28 11:27:39 +0100
message:
  * net/dbus.el (dbus-introspect, dbus-get-property)
  (dbus-set-property, dbus-get-all-properties): Use
  `dbus-call-method' when noninteractive.  (Bug#5645)
modified:
  lisp/ChangeLog
  lisp/net/dbus.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-02-28 01:22:44 +0000
+++ b/lisp/ChangeLog    2010-02-28 10:27:39 +0000
@@ -1,3 +1,9 @@
+2010-02-28  Michael Albinus  <address@hidden>
+
+       * net/dbus.el (dbus-introspect, dbus-get-property)
+       (dbus-set-property, dbus-get-all-properties): Use
+       `dbus-call-method' when noninteractive.  (Bug#5645)
+
 2010-02-28  Chong Yidong  <address@hidden>
 
        * textmodes/reftex-toc.el (reftex-toc-promote-prepare):

=== modified file 'lisp/net/dbus.el'
--- a/lisp/net/dbus.el  2010-01-13 08:35:10 +0000
+++ b/lisp/net/dbus.el  2010-02-28 10:27:39 +0000
@@ -573,7 +573,8 @@
   ;; is used, because the handler can be registered in our Emacs
   ;; instance; caller an callee would block each other.
   (dbus-ignore-errors
-    (dbus-call-method-non-blocking
+    (funcall
+     (if noninteractive 'dbus-call-method 'dbus-call-method-non-blocking)
      bus service path dbus-interface-introspectable "Introspect")))
 
 (defun dbus-introspect-xml (bus service path)
@@ -831,7 +832,8 @@
   (dbus-ignore-errors
     ;; "Get" returns a variant, so we must use the `car'.
     (car
-     (dbus-call-method-non-blocking
+     (funcall
+      (if noninteractive 'dbus-call-method 'dbus-call-method-non-blocking)
       bus service path dbus-interface-properties
       "Get" :timeout 500 interface property))))
 
@@ -842,7 +844,8 @@
 returned."
   (dbus-ignore-errors
     ;; "Set" requires a variant.
-    (dbus-call-method-non-blocking
+    (funcall
+     (if noninteractive 'dbus-call-method 'dbus-call-method-non-blocking)
      bus service path dbus-interface-properties
      "Set" :timeout 500 interface property (list :variant value))
     ;; Return VALUE.
@@ -857,7 +860,10 @@
     ;; "GetAll" returns "a{sv}".
     (let (result)
       (dolist (dict
-              (dbus-call-method-non-blocking
+              (funcall
+               (if noninteractive
+                   'dbus-call-method
+                 'dbus-call-method-non-blocking)
                bus service path dbus-interface-properties
                "GetAll" :timeout 500 interface)
               result)