summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2005-01-21 03:44:10 +0000
committerHavoc Pennington <hp@redhat.com>2005-01-21 03:44:10 +0000
commitf5cf675641e63cefc36c8a9a7a5872cc8600abcd (patch)
treef8762e202abb21da860b9af677ead55d5150dfa9 /doc
parent2abdb13ebe737e39653b79fecd93477e156b9db1 (diff)
2005-01-20 Havoc Pennington <hp@redhat.com>
* doc/dbus-tutorial.xml: replace > with &gt; * bus/services.c (bus_registry_acquire_service): validate the name and return a better error if it's no good. * doc/dbus-specification.xml: note NO_AUTO_START change * dbus/dbus-protocol.h (DBUS_HEADER_FLAG_NO_AUTO_START): change from AUTO_START, we're toggling the default * bus/dispatch.c: adapt the tests to change of auto-start default
Diffstat (limited to 'doc')
-rw-r--r--doc/dbus-specification.xml10
-rw-r--r--doc/dbus-tutorial.xml6
2 files changed, 8 insertions, 8 deletions
diff --git a/doc/dbus-specification.xml b/doc/dbus-specification.xml
index 821c6011..c0be80fb 100644
--- a/doc/dbus-specification.xml
+++ b/doc/dbus-specification.xml
@@ -757,10 +757,10 @@
to return the reply despite this flag.</entry>
</row>
<row>
- <entry><literal>AUTO_START</literal></entry>
+ <entry><literal>NO_AUTO_START</literal></entry>
<entry>0x2</entry>
- <entry>This message automatically launches an owner
- for the destination name before the message is delivered.
+ <entry>This message should not automatically launch an owner
+ for the destination name.
</entry>
</row>
</tbody>
@@ -1027,8 +1027,8 @@
flag and reply anyway.
</para>
<para>
- If a message has the flag <literal>AUTO_START</literal> and the
- destination name does not exist, then a program to own the destination
+ Unless a message has the flag <literal>NO_AUTO_START</literal>, if the
+ destination name does not exist then a program to own the destination
name will be started before the message is delivered. The message
will be held until the new program is successfully started or has
failed to start; in case of failure, an error will be returned. This
diff --git a/doc/dbus-tutorial.xml b/doc/dbus-tutorial.xml
index 44f2f7ca..ccb12d4c 100644
--- a/doc/dbus-tutorial.xml
+++ b/doc/dbus-tutorial.xml
@@ -408,7 +408,7 @@
method call on a particular object instance, a number of
nested components have to be named:
<programlisting>
- Address -> [Bus Name] -> Path -> Interface -> Method
+ Address -&gt; [Bus Name] -&gt; Path -&gt; Interface -&gt; Method
</programlisting>
The bus name is in brackets to indicate that it's optional -- you only
provide a name to route the method call to the right application
@@ -467,7 +467,7 @@ main (int argc, char **argv)
if (connection == NULL)
{
g_printerr ("Failed to open connection to bus: %s\n",
- error->message);
+ error-&gt;message);
g_error_free (error);
exit (1);
}
@@ -490,7 +490,7 @@ main (int argc, char **argv)
DBUS_TYPE_INVALID))
{
g_printerr ("Failed to complete ListNames call: %s\n",
- error->message);
+ error-&gt;message);
g_error_free (error);
exit (1);
}