diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2005-08-18 04:04:57 +0000 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2005-08-18 04:04:57 +0000 |
| commit | 8d1e7dfeb9f68541225e7a990dd700d35bb8342c (patch) | |
| tree | e2f6054b2d07bf7f4adf7d3ae60a893e8fd4e2db /doc/introspect.dtd | |
| parent | e5268be6b33e98cd4da0090da7cb2e3ab534c57a (diff) | |
* ChangeLog: clean up my last entry a bit
* doc/introspect.xsl: New stylesheet for converting introspection data
into browser renderable xhtml. Contributed by Lennart Poettering.
* doc/introspect.dtd: Fixups in the introspect format from Lennart
Poettering.
* doc/dbus-tutorial.xml:
- Add Colin Walter to the Authors section for authoring the GLib
section
- Add descriptions of the new signature and type functionality
in the Python complex type mapping section
- Add a sidenote on the new args matching functionality in
the Python bindings
- Fixed up some of the examples to use the gobject.MainLoop
instead of gtk.main
* python/_dbus.py:
(Bus::_create_args_dict): New. Converts a hash of arg matches
to a more useable format
(Bus::add_signal_receiver): add a **keywords parameter for catching
arg match parameters
(Bus::remove_signal_receiver): add a **keywords parameter for catching
arg match parameters
* python/matchrules.py:
(MatchTree::exec_matches): Check for arg matches
(SignalMatchRule::add_args_match): New method
(SignalMatchRule::execute): Added args_list parameter as an optimization
so we don't have to marshal the args more than once
(SignalMatchRule::match_args_from_list): New method that checks to see
if the rule's arg matches match an argument list. Only arguments
set in the rule are checked.
(SignalMatchRule::match_args_from_rule): New method that checks to see
if the rule's arg matches match another rule's. All args have to match
in order for this method to return true. If either rule has more args
then it is not a match.
(SignalMatchRule::is_match): Add args match
(SignalMatchRule::repr): Add args to the final output if they exist
Diffstat (limited to 'doc/introspect.dtd')
| -rw-r--r-- | doc/introspect.dtd | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/doc/introspect.dtd b/doc/introspect.dtd index fd6aa472..15d913af 100644 --- a/doc/introspect.dtd +++ b/doc/introspect.dtd @@ -4,15 +4,18 @@ <!-- see D-BUS specification for documentation --> -<!ELEMENT node (interface*,node*)> -<!ATTLIST node name CDATA #REQUIRED> +<!ELEMENT node (node|interface)*> +<!ATTLIST node name CDATA #IMPLIED> -<!ELEMENT interface (annotation*,method*,signal*,property*)> +<!ELEMENT interface (method|signal|property|annotation)*> <!ATTLIST interface name CDATA #REQUIRED> -<!ELEMENT method (annotation*,arg*)> +<!ELEMENT method (arg|annotation)*> <!ATTLIST method name CDATA #REQUIRED> +<!ELEMENT signal (arg|annotation)*> +<!ATTLIST signal name CDATA #REQUIRED> + <!ELEMENT arg EMPTY> <!ATTLIST arg name CDATA #IMPLIED> <!ATTLIST arg type CDATA #REQUIRED> @@ -21,12 +24,10 @@ The DTD format can't express that subtlety. --> <!ATTLIST arg direction (in|out) "in"> -<!ELEMENT signal (arg,annotation)> -<!ATTLIST signal name CDATA #REQUIRED> - -<!ELEMENT property (annotation)> <!-- AKA "attribute" --> +<!-- AKA "attribute" --> +<!ELEMENT property (annotation)*> <!ATTLIST property name CDATA #REQUIRED> -<!ATTLIST property type CDATA #REQUIRED> +<!ATTLIST property type CDATA #REQUIRED> <!ATTLIST property access (read|write|readwrite) #REQUIRED> <!ELEMENT annotation EMPTY> <!-- Generic metadata --> |