diff options
author | Havoc Pennington <hp@redhat.com> | 2003-04-03 21:56:22 +0000 |
---|---|---|
committer | Havoc Pennington <hp@redhat.com> | 2003-04-03 21:56:22 +0000 |
commit | f216e81432ddf04889202c33a6e68113f94d7611 (patch) | |
tree | bb8386366d183e43dc3471219ec627a21c65a639 /doc/dbus-specification.sgml | |
parent | fe9f3b45cc7e2e84d180c433f1ab5f8fd0a0c619 (diff) |
2003-04-03 Havoc Pennington <hp@redhat.com>
* bus/activation.c (load_directory): fix up memleaks
(bus_activation_entry_free): free the entry
* dbus/dbus-bus.c (dbus_bus_acquire_service): return an error if
we get one from the message bus; fix memleaks.
* dbus/dbus-message.c (dbus_set_error_from_message): new function
Diffstat (limited to 'doc/dbus-specification.sgml')
-rw-r--r-- | doc/dbus-specification.sgml | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/doc/dbus-specification.sgml b/doc/dbus-specification.sgml index 7e2fcb35..3c41068e 100644 --- a/doc/dbus-specification.sgml +++ b/doc/dbus-specification.sgml @@ -184,7 +184,7 @@ <tbody> <row> <entry>0x1</entry> - <entry>This message is an error reply.</entry> + <entry>This message is an error reply. If the first argument exists and is a string, it is an error message.</entry> </row> </tbody> </tgroup> @@ -978,12 +978,13 @@ number of the message being replied to. </para> <para> - If an error occurs, an error reply may be sent in place of the - standard reply. Error replies can be identified by a special - header flag, see <xref linkend="message-protocol-header-encoding">. - Error replies have a name which reflects the type of - error that occurred. Error replies would generally - be mapped to exceptions in a programming language. + If an error occurs, an error reply may be sent in place of the standard + reply. Error replies can be identified by a special header flag, see + <xref linkend="message-protocol-header-encoding">. Error replies have a + name which reflects the type of error that occurred. Error replies would + generally be mapped to exceptions in a programming language. If an + error reply has a first argument, and that argument has type STRING, + then the argument must be an error message. </para> <para> [FIXME discuss mapping of broadcast messages + matching rules @@ -1220,7 +1221,7 @@ # Sample service description file [D-BUS Service] Name=org.gnome.ConfigurationDatabase - Exec=gconfd-2 + Exec=/usr/libexec/gconfd-2 </programlisting> </figure> </para> |