[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116584: * net/dbus.el (dbus--init-bus): Declare fun
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] trunk r116584: * net/dbus.el (dbus--init-bus): Declare function. |
Date: |
Thu, 27 Feb 2014 15:41:17 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116584
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Thu 2014-02-27 16:41:13 +0100
message:
* net/dbus.el (dbus--init-bus): Declare function.
(dbus-path-local, dbus-interface-local): New defconst.
(dbus-init-bus): Use them.
(dbus-return-values-table): Extend doc.
(dbus-handle-bus-disconnect): Extend error message.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/net/dbus.el dbus.el-20091113204419-o5vbwnq5f7feedwu-7962
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-02-27 14:21:28 +0000
+++ b/lisp/ChangeLog 2014-02-27 15:41:13 +0000
@@ -1,3 +1,11 @@
+2014-02-27 Michael Albinus <address@hidden>
+
+ * net/dbus.el (dbus--init-bus): Declare function.
+ (dbus-path-local, dbus-interface-local): New defconst.
+ (dbus-init-bus): Use them.
+ (dbus-return-values-table): Extend doc.
+ (dbus-handle-bus-disconnect): Extend error message.
+
2014-02-27 Juanma Barranquero <address@hidden>
* subr.el (y-or-n-p): Fix double space issue in message.
=== modified file 'lisp/net/dbus.el'
--- a/lisp/net/dbus.el 2014-02-23 02:46:12 +0000
+++ b/lisp/net/dbus.el 2014-02-27 15:41:13 +0000
@@ -35,7 +35,7 @@
;; Declare used subroutines and variables.
(declare-function dbus-message-internal "dbusbind.c")
-(declare-function dbus-init-bus-1 "dbusbind.c")
+(declare-function dbus--init-bus "dbusbind.c")
(defvar dbus-message-type-invalid)
(defvar dbus-message-type-method-call)
(defvar dbus-message-type-method-return)
@@ -55,6 +55,9 @@
(defconst dbus-path-dbus "/org/freedesktop/DBus"
"The object path used to talk to the bus itself.")
+(defconst dbus-path-local (concat dbus-path-dbus "/Local")
+ "The object path used in local/in-process-generated messages.")
+
;; Default D-Bus interfaces.
(defconst dbus-interface-dbus "org.freedesktop.DBus"
@@ -129,6 +132,15 @@
;; </signal>
;; </interface>
+(defconst dbus-interface-local (concat dbus-interface-dbus ".Local")
+ "An interface whose methods can only be invoked by the local
implementation.")
+
+;; <interface name="org.freedesktop.DBus.Local">
+;; <signal name="Disconnected">
+;; <arg name="object_path" type="o"/>
+;; </signal>
+;; </interface>
+
;; Emacs defaults.
(defconst dbus-service-emacs "org.gnu.Emacs"
"The well known service name of Emacs.")
@@ -167,15 +179,20 @@
A key in this hash table is a list (:serial BUS SERIAL), like in
`dbus-registered-objects-table'. BUS is either a Lisp symbol,
`:system' or `:session', or a string denoting the bus address.
-SERIAL is the serial number of the reply message.")
+SERIAL is the serial number of the reply message.
+
+The value of an entry is a cons (STATE . RESULT). STATE can be
+either `:pending' (we are still waiting for the result),
+`:complete' (the result is available) or `:error' (the reply
+message was an error message).")
(defun dbus-call-method-handler (&rest args)
"Handler for reply messages of asynchronous D-Bus message calls.
It calls the function stored in `dbus-registered-objects-table'.
The result will be made available in `dbus-return-values-table'."
- (let* ((key (list :serial
- (dbus-event-bus-name last-input-event)
- (dbus-event-serial-number last-input-event)))
+ (let* ((key (list :serial
+ (dbus-event-bus-name last-input-event)
+ (dbus-event-serial-number last-input-event)))
(result (gethash key dbus-return-values-table)))
(when (consp result)
(setcar result :complete)
@@ -183,9 +200,9 @@
(defun dbus-notice-synchronous-call-errors (ev er)
"Detect errors resulting from pending synchronous calls."
- (let* ((key (list :serial
- (dbus-event-bus-name ev)
- (dbus-event-serial-number ev)))
+ (let* ((key (list :serial
+ (dbus-event-bus-name ev)
+ (dbus-event-serial-number ev)))
(result (gethash key dbus-return-values-table)))
(when (consp result)
(setcar result :error)
@@ -1718,7 +1735,7 @@
nil
nil
value)
- '(dbus-error "Bus disconnected"))
+ (list 'dbus-error "Bus disconnected" bus))
(push key keys-to-remove)))
dbus-registered-objects-table)
(dolist (key keys-to-remove)
@@ -1745,14 +1762,11 @@
connection used in the same Emacs process, like the one established by
GTK+. It should be used with care for at least the `:system' and
`:session' buses, because other Emacs Lisp packages might already use
-this connection to those buses.
-"
- (dbus-init-bus-1 bus private)
- (dbus-register-signal bus nil
- "/org/freedesktop/DBus/Local"
- "org.freedesktop.DBus.Local"
- "Disconnected"
- #'dbus-handle-bus-disconnect))
+this connection to those buses."
+ (dbus--init-bus bus private)
+ (dbus-register-signal
+ bus nil dbus-path-local dbus-interface-local
+ "Disconnected" #'dbus-handle-bus-disconnect))
;; Initialize `:system' and `:session' buses. This adds their file
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116584: * net/dbus.el (dbus--init-bus): Declare function.,
Michael Albinus <=