diff options
| author | Colin Walters <walters@verbum.org> | 2005-03-12 16:33:01 +0000 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2005-03-12 16:33:01 +0000 |
| commit | 3dea5c183f65c3f924fb442bf606dfeb50f028a4 (patch) | |
| tree | 0ac180fdc5c7766d003863717ef6cbeff8237806 /bus/driver.c | |
| parent | 3c1d2d65654f92f24d3e5c9c5b88d76a10f72822 (diff) | |
| download | dbus-3dea5c183f65c3f924fb442bf606dfeb50f028a4.tar.gz | |
2005-03-11 Colin Walters <walters@verbum.org>
* glib/Makefile.am: Generate dbus-glib-bindings.h and
install it.
* bus/print-introspect.c: New file; prints introspection
data for a given name and object path.
* bus/run-with-tmp-session-bus.sh: New file, refactored
from test/glib/run-test.sh. Creates a temporary session
bus and runs another program.
* test/glib/run-test.sh: Refactor to invoke
run-with-tmp-session-bus.sh.
* bus/driver.c (bus_driver_handle_introspect): Fix to print new
introspection format. Also change to use DBUS_TYPE_x_AS_STRING
macros instead of hardcoding.
* glib/.cvsignore, bus/.cvsignore, test/glib/.cvsignore: Update.
Diffstat (limited to 'bus/driver.c')
| -rw-r--r-- | bus/driver.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bus/driver.c b/bus/driver.c index 25ce0f94..e647fbf3 100644 --- a/bus/driver.c +++ b/bus/driver.c @@ -1136,7 +1136,7 @@ bus_driver_handle_introspect (DBusConnection *connection, goto oom; if (!_dbus_string_append (&xml, " <method name=\"Introspect\">\n")) goto oom; - if (!_dbus_string_append (&xml, " <arg name=\"data\" direction=\"out\" type=\"string\"/>\n")) + if (!_dbus_string_append_printf (&xml, " <arg name=\"data\" direction=\"out\" type=\"%s\"/>\n", DBUS_TYPE_STRING_AS_STRING)) goto oom; if (!_dbus_string_append (&xml, " </method>\n")) goto oom; @@ -1163,15 +1163,15 @@ bus_driver_handle_introspect (DBusConnection *connection, else if (strcmp (message_handlers[i].in_args, DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_UINT32_AS_STRING) == 0) { - if (!_dbus_string_append (&xml, " <arg direction=\"in\" type=\"string\"/>\n")) + if (!_dbus_string_append_printf (&xml, " <arg direction=\"in\" type=\"%s\"/>\n", DBUS_TYPE_STRING_AS_STRING)) goto oom; - if (!_dbus_string_append (&xml, " <arg direction=\"in\" type=\"uint32\"/>\n")) + if (!_dbus_string_append_printf (&xml, " <arg direction=\"in\" type=\"%s\"/>\n", DBUS_TYPE_UINT32_AS_STRING)) goto oom; } else if (strcmp (message_handlers[i].in_args, DBUS_TYPE_STRING_AS_STRING) == 0) { - if (!_dbus_string_append (&xml, " <arg direction=\"in\" type=\"string\"/>\n")) + if (!_dbus_string_append_printf (&xml, " <arg direction=\"in\" type=\"%s\"/>\n", DBUS_TYPE_STRING_AS_STRING)) goto oom; } else @@ -1186,26 +1186,26 @@ bus_driver_handle_introspect (DBusConnection *connection, else if (strcmp (message_handlers[i].out_args, DBUS_TYPE_STRING_AS_STRING) == 0) { - if (!_dbus_string_append (&xml, " <arg direction=\"out\" type=\"string\"/>\n")) + if (!_dbus_string_append_printf (&xml, " <arg direction=\"out\" type=\"%s\"/>\n", DBUS_TYPE_STRING_AS_STRING)) goto oom; } else if (strcmp (message_handlers[i].out_args, DBUS_TYPE_BOOLEAN_AS_STRING) == 0) { - if (!_dbus_string_append (&xml, " <arg direction=\"out\" type=\"boolean\"/>\n")) + if (!_dbus_string_append_printf (&xml, " <arg direction=\"out\" type=\"%s\"/>\n", DBUS_TYPE_BOOLEAN_AS_STRING)) goto oom; } else if (strcmp (message_handlers[i].out_args, DBUS_TYPE_UINT32_AS_STRING) == 0) { - if (!_dbus_string_append (&xml, " <arg direction=\"out\" type=\"uint32\"/>\n")) + if (!_dbus_string_append_printf (&xml, " <arg direction=\"out\" type=\"%s\"/>\n", DBUS_TYPE_UINT32_AS_STRING)) goto oom; } else if (strcmp (message_handlers[i].out_args, DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_STRING_AS_STRING) == 0) { /* FIXME introspection format doesn't handle arrays yet */ - if (!_dbus_string_append (&xml, " <arg direction=\"out\" type=\"string\"/>\n")) + if (!_dbus_string_append_printf (&xml, " <arg direction=\"out\" type=\"%s\"/>\n", DBUS_TYPE_STRING_AS_STRING)) goto oom; } else |