diff options
author | Havoc Pennington <hp@redhat.com> | 2005-01-30 05:18:44 +0000 |
---|---|---|
committer | Havoc Pennington <hp@redhat.com> | 2005-01-30 05:18:44 +0000 |
commit | 41f52c96d651003b3d0a266a582d401228a8368e (patch) | |
tree | 3b217cef0c0b9db03aa580cb541b7d686732055a /glib/dbus-gobject.c | |
parent | 2922b0e88ba00b0067c23633075629108ad8a496 (diff) |
2005-01-30 Havoc Pennington <hp@redhat.com>
dbus-viewer introspected and displayed the bus driver
* dbus/dbus-object-tree.c
(object_tree_test_iteration): add tests for a handler registered on "/"
* dbus/dbus-object-tree.c
(_dbus_decompose_path): fix to handle path "/" properly
(run_decompose_tests): add tests for path decomposition
* glib/dbus-gutils.c (_dbus_gutils_split_path): fix to handle "/"
properly
* glib/dbus-gobject.c (handle_introspect): fix quotes
* test/glib/run-test.sh: support launching the bus, then running
dbus-viewer
* test/glib/test-service-glib.c (main): put in a trivial gobject
subclass and register it on the connection
* bus/driver.c (bus_driver_handle_introspect): implement
introspection of the bus driver service
* dbus/dbus-protocol.h: add #defines for the XML namespace,
identifiers, doctype decl
* bus/driver.c (bus_driver_handle_get_service_owner): handle
attempts to get owner of DBUS_SERVICE_ORG_FREEDESKTOP_DBUS by
returning the service unchanged.
(bus_driver_handle_message): remove old check for reply_serial in
method calls, now the message type deals with that
(bus_driver_handle_message): handle NULL interface
* glib/dbus-gproxy.c (dbus_g_proxy_get_bus_name): new function
* glib/dbus-gloader-expat.c (description_load_from_string): allow
-1 for len
* tools/dbus-viewer.c: add support for introspecting a service on
a bus
* glib/dbus-gproxy.c (dbus_g_pending_call_ref): add
(dbus_g_pending_call_unref): add
Diffstat (limited to 'glib/dbus-gobject.c')
-rw-r--r-- | glib/dbus-gobject.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/glib/dbus-gobject.c b/glib/dbus-gobject.c index f08bf39e..245ebf1e 100644 --- a/glib/dbus-gobject.c +++ b/glib/dbus-gobject.c @@ -289,26 +289,28 @@ handle_introspect (DBusConnection *connection, xml = g_string_new (NULL); + g_string_append (xml, DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE); + g_string_append (xml, "<node>\n"); /* We are introspectable, though I guess that was pretty obvious */ g_string_append (xml, " <interface name=\"org.freedesktop.Introspectable\">\n"); g_string_append (xml, " <method name=\"Introspect\">\n"); - g_string_append (xml, " <arg name=\"data\" direction=\"out\" type=\"string\"\"/>\n"); + g_string_append (xml, " <arg name=\"data\" direction=\"out\" type=\"string\"/>\n"); g_string_append (xml, " </method>\n"); g_string_append (xml, " </interface>\n"); /* We support get/set properties */ g_string_append (xml, " <interface name=\"org.freedesktop.Properties\">\n"); g_string_append (xml, " <method name=\"Get\">\n"); - g_string_append (xml, " <arg name=\"interface\" direction=\"in\" type=\"string\"\"/>\n"); - g_string_append (xml, " <arg name=\"propname\" direction=\"in\" type=\"string\"\"/>\n"); - g_string_append (xml, " <arg name=\"value\" direction=\"out\" type=\"variant\"\"/>\n"); + g_string_append (xml, " <arg name=\"interface\" direction=\"in\" type=\"string\"/>\n"); + g_string_append (xml, " <arg name=\"propname\" direction=\"in\" type=\"string\"/>\n"); + g_string_append (xml, " <arg name=\"value\" direction=\"out\" type=\"variant\"/>\n"); g_string_append (xml, " </method>\n"); g_string_append (xml, " <method name=\"Set\">\n"); - g_string_append (xml, " <arg name=\"interface\" direction=\"in\" type=\"string\"\"/>\n"); - g_string_append (xml, " <arg name=\"propname\" direction=\"in\" type=\"string\"\"/>\n"); - g_string_append (xml, " <arg name=\"value\" direction=\"in\" type=\"variant\"\"/>\n"); + g_string_append (xml, " <arg name=\"interface\" direction=\"in\" type=\"string\"/>\n"); + g_string_append (xml, " <arg name=\"propname\" direction=\"in\" type=\"string\"/>\n"); + g_string_append (xml, " <arg name=\"value\" direction=\"in\" type=\"variant\"/>\n"); g_string_append (xml, " </method>\n"); g_string_append (xml, " </interface>\n"); |