Merge branch 'minor-docs-improvements' into 'master'

gio: Make minor docs improvements

See merge request GNOME/glib!952
This commit is contained in:
Philip Withnall 2019-06-26 11:05:05 +00:00
commit b555a7bfdd
3 changed files with 6 additions and 6 deletions

View File

@ -128,7 +128,7 @@
* The #GDBusConnection type is used for D-Bus connections to remote * The #GDBusConnection type is used for D-Bus connections to remote
* peers such as a message buses. It is a low-level API that offers a * peers such as a message buses. It is a low-level API that offers a
* lot of flexibility. For instance, it lets you establish a connection * lot of flexibility. For instance, it lets you establish a connection
* over any transport that can by represented as an #GIOStream. * over any transport that can by represented as a #GIOStream.
* *
* This class is rarely used directly in D-Bus clients. If you are writing * This class is rarely used directly in D-Bus clients. If you are writing
* a D-Bus client, it is often easier to use the g_bus_own_name(), * a D-Bus client, it is often easier to use the g_bus_own_name(),
@ -2968,8 +2968,8 @@ g_dbus_connection_new_for_address_sync (const gchar *address,
* more details. * more details.
* *
* Note that this function should be used with care. Most modern UNIX * Note that this function should be used with care. Most modern UNIX
* desktops tie the notion of a user session the session bus, and expect * desktops tie the notion of a user session with the session bus, and expect
* all of a users applications to quit when their bus connection goes away. * all of a user's applications to quit when their bus connection goes away.
* If you are setting @exit_on_close to %FALSE for the shared session * If you are setting @exit_on_close to %FALSE for the shared session
* bus connection, you should make sure that your application exits * bus connection, you should make sure that your application exits
* when the user session ends. * when the user session ends.
@ -7364,7 +7364,7 @@ bus_get_async_initable_cb (GObject *source_object,
* When the operation is finished, @callback will be invoked. You can * When the operation is finished, @callback will be invoked. You can
* then call g_bus_get_finish() to get the result of the operation. * then call g_bus_get_finish() to get the result of the operation.
* *
* This is a asynchronous failable function. See g_bus_get_sync() for * This is an asynchronous failable function. See g_bus_get_sync() for
* the synchronous version. * the synchronous version.
* *
* Since: 2.26 * Since: 2.26

View File

@ -701,7 +701,7 @@ _g_dbus_worker_do_read_cb (GInputStream *input_stream,
worker); worker);
#endif #endif
/* TODO: hmm, hmm... */ /* The read failed, which could mean the dbus-daemon was sent SIGTERM. */
if (bytes_read == 0) if (bytes_read == 0)
{ {
g_set_error (&error, g_set_error (&error,

View File

@ -801,7 +801,7 @@ g_test_dbus_stop (GTestDBus *self)
* Stop the session bus started by g_test_dbus_up(). * Stop the session bus started by g_test_dbus_up().
* *
* This will wait for the singleton returned by g_bus_get() or g_bus_get_sync() * This will wait for the singleton returned by g_bus_get() or g_bus_get_sync()
* is destroyed. This is done to ensure that the next unit test won't get a * to be destroyed. This is done to ensure that the next unit test won't get a
* leaked singleton from this test. * leaked singleton from this test.
*/ */
void void