From 030cc1e53c6216853e08e27b92f72db80d001873 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sat, 12 Mar 2005 20:07:21 +0000 Subject: 2005-03-12 Colin Walters * bus/driver.c (write_args_for_direction): New function, parses a type signature into arguments and outputs to XML. (bus_driver_handle_introspect): Use it instead of hardcoding XML for certain signatures. * bus/Makefile.am (dbus-bus-introspect.xml): Add dependency on dbus-daemon. * glib/dbus-glib-tool.c (main): Parse ignore_unsupported argument, pass it to dbus_binding_tool_output_glib_client. * glib/dbus-binding-tool-glib.c (generate_client_glue): Protect against multiple inclusion. (dbus_binding_tool_output_glib_client): Add G_BEGIN_DECLS/G_END_DECLS. * glib/dbus-binding-tool-glib.c (compute_client_method_name): Change to just take iface prefix directly. (write_formal_parameters): Clarify error message. (check_supported_parameters): New function; checks to see type signatures of method parameters are supported. (generate_client_glue): Handle ignore_unsupported flag. (dbus_binding_tool_output_glib_client): Handle ignore_unsupported parameter. * glib/Makefile.am (dbus-glib-bindings.h): Pass --ignore-unsupported by default until glib bindings support arrays. --- glib/dbus-glib-tool.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'glib/dbus-glib-tool.c') diff --git a/glib/dbus-glib-tool.c b/glib/dbus-glib-tool.c index 2fc564c4..85f78ed4 100644 --- a/glib/dbus-glib-tool.c +++ b/glib/dbus-glib-tool.c @@ -277,6 +277,7 @@ main (int argc, char **argv) struct stat srcbuf; struct stat targetbuf; gboolean force; + gboolean ignore_unsupported; setlocale (LC_ALL, ""); bindtextdomain (GETTEXT_PACKAGE, DBUS_LOCALEDIR); @@ -290,6 +291,7 @@ main (int argc, char **argv) files = NULL; prev_arg = NULL; output_file = NULL; + ignore_unsupported = FALSE; force = FALSE; i = 1; while (i < argc) @@ -322,6 +324,8 @@ main (int argc, char **argv) else usage (1); } + else if (strcmp (arg, "--ignore-unsupported") == 0) + ignore_unsupported = TRUE; else if (strncmp (arg, "--output=", 9) == 0) { output_file = arg + 9; @@ -413,7 +417,7 @@ main (int argc, char **argv) lose_gerror (_("Compilation failed"), error); break; case DBUS_BINDING_OUTPUT_GLIB_CLIENT: - if (!dbus_binding_tool_output_glib_client ((BaseInfo *) node, channel, &error)) + if (!dbus_binding_tool_output_glib_client ((BaseInfo *) node, channel, ignore_unsupported, &error)) lose_gerror (_("Compilation failed"), error); break; case DBUS_BINDING_OUTPUT_NONE: -- cgit