branch: externals/dbus-codegen
commit 04114e4cbc8f422e6b77cfc202d1109c96316117
Merge: 6644979dfe fb5f2da5c0
Author: Daiki Ueno <u...@gnu.org>
Commit: Daiki Ueno <u...@gnu.org>
Merge commit 'fb5f2da5c0'
---
dbus-codegen.el | 14 +++++++-------
tests/dbus-codegen-tests.el | 7 ++++---
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/dbus-codegen.el b/dbus-codegen.el
index 5f60dd1b9c..334e20b8f2 100644
--- a/dbus-codegen.el
+++ b/dbus-codegen.el
@@ -1,6 +1,6 @@
;;; dbus-codegen.el --- Lisp code generation for D-Bus. -*- lexical-binding:
t; -*-
-;; Copyright (C) 2015 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2019 Free Software Foundation, Inc.
;; Author: Daiki Ueno <u...@gnu.org>
;; Keywords: comm, dbus, convenience
@@ -168,10 +168,10 @@
;; Base type of a D-Bus proxy and a skeleton.
(cl-defstruct (dbus-codegen-object
(:constructor nil))
- (bus :read-only t)
- (service :read-only t)
- (path :read-only t)
- (interface :read-only t)
+ (bus nil :read-only t)
+ (service nil :read-only t)
+ (path nil :read-only t)
+ (interface nil :read-only t)
registration-list)
;; Base type of a D-Bus proxy.
@@ -626,7 +626,7 @@ XML is either a string which defines the interface of the
D-Bus
proxy, or a Lisp form which returns a string. The format of the
string must comply with the standard D-Bus introspection data
format as described in:
-`http://dbus.freedesktop.org/doc/dbus-specification.html#introspection-format>'.
+`http://dbus.freedesktop.org/doc/dbus-specification.html#introspection-format'.
INTERFACE is a name of interface which is represented by this
proxy.
@@ -828,7 +828,7 @@ XML is either a string which defines the interface of the
D-Bus
skeleton, or a Lisp form which returns a string. The format of the
string must comply with the standard D-Bus introspection data
format as described in:
-`http://dbus.freedesktop.org/doc/dbus-specification.html#introspection-format>'.
+`http://dbus.freedesktop.org/doc/dbus-specification.html#introspection-format'.
INTERFACE is a name of interface which is represented by this
skeleton.
diff --git a/tests/dbus-codegen-tests.el b/tests/dbus-codegen-tests.el
index 2303976a75..6184c46525 100644
--- a/tests/dbus-codegen-tests.el
+++ b/tests/dbus-codegen-tests.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
@@ -58,7 +58,8 @@
'(:array (:dict-entry :string :int32))
'(("a" . 1) ("b" . 2) ("c" . 3))))))
-(defconst dbus-codegen-tests-introspection-data "\
+(eval-when-compile
+ (defconst dbus-codegen-tests-introspection-data "\
<node>
<interface name='org.gtk.GDBus.PeerTestInterface'>
<method name='HelloPeer'>
@@ -79,7 +80,7 @@
value='false'/>
</property>
</interface>
-</node>")
+</node>"))
(ert-deftest dbus-codegen-define-proxy ()
(dbus-codegen-define-proxy test-proxy
