diff options
| author | Colin Walters <walters@verbum.org> | 2005-02-27 17:38:12 +0000 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2005-02-27 17:38:12 +0000 |
| commit | 2b97fb81a508a047b14f4c4426c28abfd18bb2e0 (patch) | |
| tree | d44ef7f2fe5d373ac44e3a41add8bd3f08e2a8fc /test/glib | |
| parent | ee27481d7b7d6d9a4f41b7d641a2618dedf676dd (diff) | |
2005-02-27 Colin Walters <walters@verbum.org>
* glib/dbus-gidl.c (property_info_get_type, arg_info_get_type):
Change return value to const char * instead of int so we can do
full signatures.
(struct PropertyInfo, struct ArgInfo): Store char *.
(property_info_new, arg_info_new): Update parameters, strdup.
(property_info_unref, arg_info_unref): Free.
* glib/dbus-gidl.h: Update prototypes.
* glib/dbus-gparser.c (basic_type_from_string): Delete.
(validate_signature): New function, just validates signature and
sets GError.
(parse_property, parse_arg): Invoke validate_signature. Store
signature instead of just type code.
* glib/dbus-gvalue.c (base_type_from_signature): New utility
function to return a primary type for a signature, dropping
information about types in container types.
(dbus_gvalue_genmarshal_name_from_type)
(dbus_gvalue_binding_type_from_type)
(dbus_gvalue_ctype_from_type): Update to take full signature
instead of type code.
(dbus_gtype_to_dbus_type): Moved here from glib/dbus-gobject.c.
* glib/dbus-gvalue.h: Update prototypes for above.
* glib/dbus-gobject.c (gtype_to_dbus_type): Moved to
glib/dbus-gvalue.c as dbus_gtype_to_dbus_type.
(introspect_properties, introspect_signals, write_interface):
Update to handle signatures, and remove usage of
_dbus_gutils_type_to_string.
(handle_introspect): Print out type codes instead of e.g. "string"
in hardcoded introspection XML; also use x_AS_STRING constants
instead of hardcoding in string.
* glib/dbus-glib-tool.c (pretty_print): Handle signature change
to string. Remove usage of _dbus_gutils_type_to_string.
* glib/dbus-gutils.c (_dbus_gutils_type_to_string): Delete.
* glib/dbus-gutils.h (_dbus_gutils_type_to_string): Update for
deletion.
* glib/dbus-binding-tool-glib.c (compute_marshaller)
(compute_marshaller_name, generate_glue): Handle signature change
to string.
(write_formal_parameters, write_args_for_direction): Ditto, and
remove FIXME.
* tools/dbus-tree-view.c (type_to_string): Delete.
(info_set_func_text): Update to print full signatures.
* test/glib/test-service-glib.xml: Change types to new
introspection format.
Diffstat (limited to 'test/glib')
| -rw-r--r-- | test/glib/test-service-glib.xml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/glib/test-service-glib.xml b/test/glib/test-service-glib.xml index 298e2ddb..80a815fa 100644 --- a/test/glib/test-service-glib.xml +++ b/test/glib/test-service-glib.xml @@ -11,8 +11,8 @@ <method name="Increment"> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="my_object_increment"/> - <arg type="uint32" name="x" /> - <arg type="uint32" direction="out" /> + <arg type="u" name="x" /> + <arg type="u" direction="out" /> </method> <method name="ThrowError"> @@ -21,17 +21,17 @@ <method name="Uppercase"> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="my_object_uppercase"/> - <arg type="string" direction="in" /> - <arg type="string" direction="out" /> + <arg type="s" direction="in" /> + <arg type="s" direction="out" /> </method> <method name="ManyArgs"> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="my_object_many_args"/> - <arg type="uint32" name="x" direction="in" /> - <arg type="string" name="str" direction="in" /> - <arg type="double" name="trouble" direction="in" /> - <arg type="double" name="d_ret" direction="out" /> - <arg type="string" name="str_ret" direction="out" /> + <arg type="u" name="x" direction="in" /> + <arg type="s" name="str" direction="in" /> + <arg type="d" name="trouble" direction="in" /> + <arg type="d" name="d_ret" direction="out" /> + <arg type="s" name="str_ret" direction="out" /> </method> </interface> |