diff options
| author | Colin Walters <walters@verbum.org> | 2005-02-17 21:11:18 +0000 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2005-02-17 21:11:18 +0000 |
| commit | dc12fac5f8a36d0276719bc5a98aa63bffe86399 (patch) | |
| tree | 4f8e865c9933a261be0aaa3f72fa66a44786813d /glib/dbus-binding-tool-glib.h | |
| parent | 03f6615eaccc2c1f84d4252e5a627a2ac86d41d9 (diff) | |
2005-02-17 Colin Walters <walters@verbum.org>
* glib/dbus-gparser.c (struct Parser): Add in_annotation boolean.
(parse_node, parse_interface, parse_method, parse_signal)
(parse_property, parse_annotation): Lose if we're currently in an
annotation.
(parse_annotation): New function.
(parser_start_element, parser_end_element): Handle annotation.
(parse_method, parse_interface): Remove support for c_name attribute,
switch to annotations.
* glib/dbus-gidl.h (interface_info_get_binding_names)
(method_info_get_binding_names)
(interface_info_get_binding_name, method_info_get_binding_name)
(interface_info_set_binding_name, method_info_set_binding_name):
Remove.
(interface_info_get_annotations, method_info_get_annotations)
(interface_info_get_annotation, method_info_get_annotation)
(interface_info_add_annotation, method_info_add_annotation):
Prototype.
* glib/dbus-gidl.c (struct InterfaceInfo): Substitute "annotations"
for "bindings".
(struct MethodInfo): Ditto.
Straightfoward conversion of binding methods into annotation methods
as prototyped.
* glib/dbus-glib-tool.c (pretty_print): Print annotations.
* glib/dbus-binding-tool-glib.h (DBUS_GLIB_ANNOTATION_C_SYMBOL): Define.
* glib/dbus-binding-tool-glib.c (gather_marshallers, generate_glue):
Use new annotation API.
* doc/introspect.dtd: Fix a number of DTD syntax errors. Add
annotation element.
* doc/dbus-specification.xml: Discuss introspection annotations,
include list of well-known annotations.
* test/glib/test-service-glib.xml: Make validate against new DTD.
Diffstat (limited to 'glib/dbus-binding-tool-glib.h')
| -rw-r--r-- | glib/dbus-binding-tool-glib.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/glib/dbus-binding-tool-glib.h b/glib/dbus-binding-tool-glib.h index d4589bc9..6667438a 100644 --- a/glib/dbus-binding-tool-glib.h +++ b/glib/dbus-binding-tool-glib.h @@ -25,6 +25,8 @@ G_BEGIN_DECLS +#define DBUS_GLIB_ANNOTATION_C_SYMBOL "org.freedesktop.DBus.GLib.CSymbol" + gboolean dbus_binding_tool_output_glib_client (BaseInfo *info, GIOChannel *channel, GError **error); gboolean dbus_binding_tool_output_glib_server (BaseInfo *info, GIOChannel *channel, GError **error); |