Commit 17f51583 authored by Matthias Clasen's avatar Matthias Clasen

Docs: Convert examples to |[ ]|

parent 4d12e0d6
...@@ -160,9 +160,7 @@ g_action_map_remove_action (GActionMap *action_map, ...@@ -160,9 +160,7 @@ g_action_map_remove_action (GActionMap *action_map,
* *
* Each action is constructed as per one #GActionEntry. * Each action is constructed as per one #GActionEntry.
* *
* <example> * |[
* <title>Using g_action_map_add_action_entries()</title>
* <programlisting>
* static void * static void
* activate_quit (GSimpleAction *simple, * activate_quit (GSimpleAction *simple,
* GVariant *parameter, * GVariant *parameter,
...@@ -193,8 +191,7 @@ g_action_map_remove_action (GActionMap *action_map, ...@@ -193,8 +191,7 @@ g_action_map_remove_action (GActionMap *action_map,
* *
* return G_ACTION_GROUP (group); * return G_ACTION_GROUP (group);
* } * }
* </programlisting> * ]|
* </example>
* *
* Since: 2.32 * Since: 2.32
*/ */
......
...@@ -75,17 +75,17 @@ ...@@ -75,17 +75,17 @@
* On Linux, the D-Bus session bus is used for communication. * On Linux, the D-Bus session bus is used for communication.
* *
* The use of #GApplication differs from some other commonly-used * The use of #GApplication differs from some other commonly-used
* uniqueness libraries (such as libunique) in important ways. The * uniqueness libraries (such as libunique) in important ways. The
* application is not expected to manually register itself and check if * application is not expected to manually register itself and check
* it is the primary instance. Instead, the <code>main()</code> * if it is the primary instance. Instead, the main() function of a
* function of a #GApplication should do very little more than * #GApplication should do very little more than instantiating the
* instantiating the application instance, possibly connecting signal * application instance, possibly connecting signal handlers, then
* handlers, then calling g_application_run(). All checks for * calling g_application_run(). All checks for uniqueness are done
* uniqueness are done internally. If the application is the primary * internally. If the application is the primary instance then the
* instance then the startup signal is emitted and the mainloop runs. * startup signal is emitted and the mainloop runs. If the application
* If the application is not the primary instance then a signal is sent * is not the primary instance then a signal is sent to the primary
* to the primary instance and g_application_run() promptly returns. * instance and g_application_run() promptly returns. See the code
* See the code examples below. * examples below.
* *
* If used, the expected form of an application identifier is very close * If used, the expected form of an application identifier is very close
* to that of of a * to that of of a
......
...@@ -789,11 +789,10 @@ enumerate_mimetypes_dir (const char *dir, ...@@ -789,11 +789,10 @@ enumerate_mimetypes_dir (const char *dir,
* *
* Gets a list of strings containing all the registered content types * Gets a list of strings containing all the registered content types
* known to the system. The list and its data should be freed using * known to the system. The list and its data should be freed using
* <programlisting> * g_list_free_full (list, g_free).
* g_list_free_full (list, g_free);
* </programlisting>
* *
* Returns: (element-type utf8) (transfer full): #GList of the registered content types * Returns: (element-type utf8) (transfer full): list of the registered
* content types
*/ */
GList * GList *
g_content_types_get_registered (void) g_content_types_get_registered (void)
......
...@@ -55,8 +55,8 @@ ...@@ -55,8 +55,8 @@
* automatically map from D-Bus errors to #GError and back. This * automatically map from D-Bus errors to #GError and back. This
* is typically done in the function returning the #GQuark for the * is typically done in the function returning the #GQuark for the
* error domain: * error domain:
* <example id="error-registration"><title>Error Registration</title><programlisting> * |[
* /<!-- -->* foo-bar-error.h: *<!-- -->/ * /&ast; foo-bar-error.h: &ast;/
* *
* #define FOO_BAR_ERROR (foo_bar_error_quark ()) * #define FOO_BAR_ERROR (foo_bar_error_quark ())
* GQuark foo_bar_error_quark (void); * GQuark foo_bar_error_quark (void);
...@@ -66,10 +66,10 @@ ...@@ -66,10 +66,10 @@
* FOO_BAR_ERROR_FAILED, * FOO_BAR_ERROR_FAILED,
* FOO_BAR_ERROR_ANOTHER_ERROR, * FOO_BAR_ERROR_ANOTHER_ERROR,
* FOO_BAR_ERROR_SOME_THIRD_ERROR, * FOO_BAR_ERROR_SOME_THIRD_ERROR,
* FOO_BAR_N_ERRORS /<!-- -->*< skip >*<!-- -->/ * FOO_BAR_N_ERRORS /&ast;< skip >&ast;/
* } FooBarError; * } FooBarError;
* *
* /<!-- -->* foo-bar-error.c: *<!-- -->/ * /&ast; foo-bar-error.c: &ast;/
* *
* static const GDBusErrorEntry foo_bar_error_entries[] = * static const GDBusErrorEntry foo_bar_error_entries[] =
* { * {
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
* {FOO_BAR_ERROR_SOME_THIRD_ERROR, "org.project.Foo.Bar.Error.SomeThirdError"}, * {FOO_BAR_ERROR_SOME_THIRD_ERROR, "org.project.Foo.Bar.Error.SomeThirdError"},
* }; * };
* *
* /<!-- -->* Ensure that every error code has an associated D-Bus error name *<!-- -->/ * /&ast; Ensure that every error code has an associated D-Bus error name &ast;/
* G_STATIC_ASSERT (G_N_ELEMENTS (foo_bar_error_entries) == FOO_BAR_N_ERRORS); * G_STATIC_ASSERT (G_N_ELEMENTS (foo_bar_error_entries) == FOO_BAR_N_ERRORS);
* *
* GQuark * GQuark
...@@ -91,15 +91,15 @@ ...@@ -91,15 +91,15 @@
* G_N_ELEMENTS (foo_bar_error_entries)); * G_N_ELEMENTS (foo_bar_error_entries));
* return (GQuark) quark_volatile; * return (GQuark) quark_volatile;
* } * }
* </programlisting></example> * ]|
* With this setup, a D-Bus peer can transparently pass e.g. %FOO_BAR_ERROR_ANOTHER_ERROR and * With this setup, a D-Bus peer can transparently pass e.g. %FOO_BAR_ERROR_ANOTHER_ERROR and
* other peers will see the D-Bus error name <literal>org.project.Foo.Bar.Error.AnotherError</literal>. * other peers will see the D-Bus error name org.project.Foo.Bar.Error.AnotherError.
* *
* If the other peer is using GDBus, and has registered the association with * If the other peer is using GDBus, and has registered the association with
* g_dbus_error_register_error_domain() in advance (e.g. by invoking the %FOO_BAR_ERROR quark * g_dbus_error_register_error_domain() in advance (e.g. by invoking the %FOO_BAR_ERROR quark
* generation itself in the previous example) the peer will see also %FOO_BAR_ERROR_ANOTHER_ERROR instead * generation itself in the previous example) the peer will see also %FOO_BAR_ERROR_ANOTHER_ERROR instead
* of %G_IO_ERROR_DBUS_ERROR. Note that GDBus clients can still recover * of %G_IO_ERROR_DBUS_ERROR. Note that GDBus clients can still recover
* <literal>org.project.Foo.Bar.Error.AnotherError</literal> using g_dbus_error_get_remote_error(). * org.project.Foo.Bar.Error.AnotherError using g_dbus_error_get_remote_error().
* *
* Note that errors in the %G_DBUS_ERROR error domain is intended only * Note that errors in the %G_DBUS_ERROR error domain is intended only
* for returning errors from a remote message bus process. Errors * for returning errors from a remote message bus process. Errors
......
...@@ -3349,7 +3349,7 @@ _sort_keys_func (gconstpointer a, ...@@ -3349,7 +3349,7 @@ _sort_keys_func (gconstpointer a,
* The contents of the description has no ABI guarantees, the contents * The contents of the description has no ABI guarantees, the contents
* and formatting is subject to change at any time. Typical output * and formatting is subject to change at any time. Typical output
* looks something like this: * looks something like this:
* <programlisting> * |[
* Type&colon; method-call * Type&colon; method-call
* Flags&colon; none * Flags&colon; none
* Version&colon; 0 * Version&colon; 0
...@@ -3362,9 +3362,9 @@ _sort_keys_func (gconstpointer a, ...@@ -3362,9 +3362,9 @@ _sort_keys_func (gconstpointer a,
* Body&colon; () * Body&colon; ()
* UNIX File Descriptors: * UNIX File Descriptors:
* (none) * (none)
* </programlisting> * ]|
* or * or
* <programlisting> * |[
* Type&colon; method-return * Type&colon; method-return
* Flags&colon; no-reply-expected * Flags&colon; no-reply-expected
* Version&colon; 0 * Version&colon; 0
...@@ -3377,7 +3377,7 @@ _sort_keys_func (gconstpointer a, ...@@ -3377,7 +3377,7 @@ _sort_keys_func (gconstpointer a,
* Body&colon; () * Body&colon; ()
* UNIX File Descriptors&colon; * UNIX File Descriptors&colon;
* fd 12: dev=0:10,mode=020620,ino=5,uid=500,gid=5,rdev=136:2,size=0,atime=1273085037,mtime=1273085851,ctime=1272982635 * fd 12: dev=0:10,mode=020620,ino=5,uid=500,gid=5,rdev=136:2,size=0,atime=1273085037,mtime=1273085851,ctime=1272982635
* </programlisting> * ]|
* *
* Returns: A string that should be freed with g_free(). * Returns: A string that should be freed with g_free().
* *
......
...@@ -447,9 +447,9 @@ g_file_has_uri_scheme (GFile *file, ...@@ -447,9 +447,9 @@ g_file_has_uri_scheme (GFile *file,
* *
* Gets the URI scheme for a #GFile. * Gets the URI scheme for a #GFile.
* RFC 3986 decodes the scheme as: * RFC 3986 decodes the scheme as:
* <programlisting> * |[
* URI = scheme ":" hier-part [ "?" query ] [ "#" fragment ] * URI = scheme ":" hier-part [ "?" query ] [ "#" fragment ]
* </programlisting> * ]|
* Common schemes include "file", "http", "ftp", etc. * Common schemes include "file", "http", "ftp", etc.
* *
* This call does no blocking I/O. * This call does no blocking I/O.
......
...@@ -1203,8 +1203,7 @@ g_menu_item_new_submenu (const gchar *label, ...@@ -1203,8 +1203,7 @@ g_menu_item_new_submenu (const gchar *label,
* second with the "Cut", "Copy" and "Paste" items. The first and * second with the "Cut", "Copy" and "Paste" items. The first and
* second menus would then be added as submenus of the third. In XML * second menus would then be added as submenus of the third. In XML
* format, this would look something like the following: * format, this would look something like the following:
* * |[
* <informalexample><programlisting><![CDATA[
* <menu id='edit-menu'> * <menu id='edit-menu'>
* <section> * <section>
* <item label='Undo'/> * <item label='Undo'/>
...@@ -1216,7 +1215,7 @@ g_menu_item_new_submenu (const gchar *label, ...@@ -1216,7 +1215,7 @@ g_menu_item_new_submenu (const gchar *label,
* <item label='Paste'/> * <item label='Paste'/>
* </section> * </section>
* </menu> * </menu>
* ]]></programlisting></informalexample> * ]|
* *
* The following example is exactly equivalent. It is more illustrative * The following example is exactly equivalent. It is more illustrative
* of the exact relationship between the menus and items (keeping in * of the exact relationship between the menus and items (keeping in
...@@ -1224,8 +1223,7 @@ g_menu_item_new_submenu (const gchar *label, ...@@ -1224,8 +1223,7 @@ g_menu_item_new_submenu (const gchar *label,
* containing one). The style of the second example is more verbose and * containing one). The style of the second example is more verbose and
* difficult to read (and therefore not recommended except for the * difficult to read (and therefore not recommended except for the
* purpose of understanding what is really going on). * purpose of understanding what is really going on).
* * |[
* <informalexample><programlisting><![CDATA[
* <menu id='edit-menu'> * <menu id='edit-menu'>
* <item> * <item>
* <link name='section'> * <link name='section'>
...@@ -1241,7 +1239,7 @@ g_menu_item_new_submenu (const gchar *label, ...@@ -1241,7 +1239,7 @@ g_menu_item_new_submenu (const gchar *label,
* </link> * </link>
* </item> * </item>
* </menu> * </menu>
* ]]></programlisting></informalexample> * ]|
* *
* Returns: a new #GMenuItem * Returns: a new #GMenuItem
* *
......
...@@ -82,8 +82,8 @@ G_DEFINE_BOXED_TYPE (GResource, g_resource, g_resource_ref, g_resource_unref) ...@@ -82,8 +82,8 @@ G_DEFINE_BOXED_TYPE (GResource, g_resource, g_resource_ref, g_resource_unref)
* which takes an xml file that describes the bundle, and a set of files that the xml references. These * which takes an xml file that describes the bundle, and a set of files that the xml references. These
* are combined into a binary resource bundle. * are combined into a binary resource bundle.
* *
* <example id="resource-example"><title>Example resource description</title> * An example resource description:
* <programlisting><![CDATA[ * |[
* <?xml version="1.0" encoding="UTF-8"?> * <?xml version="1.0" encoding="UTF-8"?>
* <gresources> * <gresources>
* <gresource prefix="/org/gtk/Example"> * <gresource prefix="/org/gtk/Example">
...@@ -92,14 +92,14 @@ G_DEFINE_BOXED_TYPE (GResource, g_resource, g_resource_ref, g_resource_unref) ...@@ -92,14 +92,14 @@ G_DEFINE_BOXED_TYPE (GResource, g_resource, g_resource_ref, g_resource_unref)
* <file preprocess="xml-stripblanks">menumarkup.xml</file> * <file preprocess="xml-stripblanks">menumarkup.xml</file>
* </gresource> * </gresource>
* </gresources> * </gresources>
* ]]></programlisting></example> * ]|
* *
* This will create a resource bundle with the following files: * This will create a resource bundle with the following files:
* <programlisting><![CDATA[ * |[
* /org/gtk/Example/data/splashscreen.png * /org/gtk/Example/data/splashscreen.png
* /org/gtk/Example/dialog.ui * /org/gtk/Example/dialog.ui
* /org/gtk/Example/menumarkup.xml * /org/gtk/Example/menumarkup.xml
* ]]></programlisting> * ]|
* *
* Note that all resources in the process share the same namespace, so use java-style * Note that all resources in the process share the same namespace, so use java-style
* path prefixes (like in the above example) to avoid conflicts. * path prefixes (like in the above example) to avoid conflicts.
......
...@@ -118,8 +118,8 @@ ...@@ -118,8 +118,8 @@
* access the numeric values corresponding to the string value of enum * access the numeric values corresponding to the string value of enum
* and flags keys. * and flags keys.
* *
* <example id="schema-default-values"><title>Default values</title> * An example for default value:
* <programlisting><![CDATA[ * |[
* <schemalist> * <schemalist>
* <schema id="org.gtk.Test" path="/org/gtk/Test/" gettext-domain="test"> * <schema id="org.gtk.Test" path="/org/gtk/Test/" gettext-domain="test">
* *
...@@ -137,10 +137,10 @@ ...@@ -137,10 +137,10 @@
* *
* </schema> * </schema>
* </schemalist> * </schemalist>
* ]]></programlisting></example> * ]|
* *
* <example id="schema-enumerated"><title>Ranges, choices and enumerated types</title> * An example for ranges, choices and enumerated types:
* <programlisting><![CDATA[ * |[
* <schemalist> * <schemalist>
* *
* <enum id="org.gtk.Test.myenum"> * <enum id="org.gtk.Test.myenum">
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
* </key> * </key>
* </schema> * </schema>
* </schemalist> * </schemalist>
* ]]></programlisting></example> * ]|
* *
* <refsect2> * <refsect2>
* <title>Vendor overrides</title> * <title>Vendor overrides</title>
...@@ -197,11 +197,11 @@ ...@@ -197,11 +197,11 @@
* directory as the XML schema sources which can override default values. * directory as the XML schema sources which can override default values.
* The schema id serves as the group name in the key file, and the values * The schema id serves as the group name in the key file, and the values
* are expected in serialized GVariant form, as in the following example: * are expected in serialized GVariant form, as in the following example:
* <informalexample><programlisting> * |[
* [org.gtk.Example] * [org.gtk.Example]
* key1='string' * key1='string'
* key2=1.5 * key2=1.5
* </programlisting></informalexample> * ]|
* </para> * </para>
* <para> * <para>
* glib-compile-schemas expects schema files to have the extension * glib-compile-schemas expects schema files to have the extension
......
...@@ -394,13 +394,12 @@ g_simple_action_class_init (GSimpleActionClass *class) ...@@ -394,13 +394,12 @@ g_simple_action_class_init (GSimpleActionClass *class)
* *
* If no handler is connected to this signal then the default * If no handler is connected to this signal then the default
* behaviour is to call g_simple_action_set_state() to set the state * behaviour is to call g_simple_action_set_state() to set the state
* to the requested value. If you connect a signal handler then no * to the requested value. If you connect a signal handler then no
* default action is taken. If the state should change then you must * default action is taken. If the state should change then you must
* call g_simple_action_set_state() from the handler. * call g_simple_action_set_state() from the handler.
* *
* <example> * An example of a 'change-state' handler:
* <title>Example 'change-state' handler</title> * |[
* <programlisting>
* static void * static void
* change_volume_state (GSimpleAction *action, * change_volume_state (GSimpleAction *action,
* GVariant *value, * GVariant *value,
...@@ -410,15 +409,14 @@ g_simple_action_class_init (GSimpleActionClass *class) ...@@ -410,15 +409,14 @@ g_simple_action_class_init (GSimpleActionClass *class)
* *
* requested = g_variant_get_int32 (value); * requested = g_variant_get_int32 (value);
* *
* // Volume only goes from 0 to 10 * /&ast; Volume only goes from 0 to 10 &ast;/
* if (0 <= requested && requested <= 10) * if (0 <= requested && requested <= 10)
* g_simple_action_set_state (action, value); * g_simple_action_set_state (action, value);
* } * }
* </programlisting> * ]|
* </example>
* *
* The handler need not set the state to the requested value. It * The handler need not set the state to the requested value.
* could set it to any value at all, or take some other action. * It could set it to any value at all, or take some other action.
* *
* Since: 2.30 * Since: 2.30
*/ */
...@@ -434,7 +432,7 @@ g_simple_action_class_init (GSimpleActionClass *class) ...@@ -434,7 +432,7 @@ g_simple_action_class_init (GSimpleActionClass *class)
/** /**
* GSimpleAction:name: * GSimpleAction:name:
* *
* The name of the action. This is mostly meaningful for identifying * The name of the action. This is mostly meaningful for identifying
* the action once it has been added to a #GSimpleActionGroup. * the action once it has been added to a #GSimpleActionGroup.
* *
* Since: 2.28 * Since: 2.28
......
...@@ -51,8 +51,8 @@ ...@@ -51,8 +51,8 @@
* you can use g_task_propagate_pointer() or the like to extract * you can use g_task_propagate_pointer() or the like to extract
* the return value. * the return value.
* </para> * </para>
* <example id="gtask-async"><title>GTask as a GAsyncResult</title> * Here is an example for using GTask as a GAsyncResult:
* <programlisting> * |[
* typedef struct { * typedef struct {
* CakeFrostingType frosting; * CakeFrostingType frosting;
* char *message; * char *message;
...@@ -144,8 +144,7 @@ ...@@ -144,8 +144,7 @@
* *
* return g_task_propagate_pointer (G_TASK (result), error); * return g_task_propagate_pointer (G_TASK (result), error);
* } * }
* </programlisting> * ]|
* </example>
* </refsect2> * </refsect2>
* <refsect2> * <refsect2>
* <title>Chained asynchronous operations</title> * <title>Chained asynchronous operations</title>
...@@ -161,8 +160,9 @@ ...@@ -161,8 +160,9 @@
* source to fire (automatically using the correct #GMainContext * source to fire (automatically using the correct #GMainContext
* and priority). * and priority).
* </para> * </para>
* <example id="gtask-chained"><title>Chained asynchronous operations</title> *
* <programlisting> * Here is an example for chained asynchronous operations:
* |[
* typedef struct { * typedef struct {
* Cake *cake; * Cake *cake;
* CakeFrostingType frosting; * CakeFrostingType frosting;
...@@ -287,8 +287,7 @@ ...@@ -287,8 +287,7 @@
* *
* return g_task_propagate_pointer (G_TASK (result), error); * return g_task_propagate_pointer (G_TASK (result), error);
* } * }
* </programlisting> * ]|
* </example>
* </refsect2> * </refsect2>
* <refsect2> * <refsect2>
* <title>Asynchronous operations from synchronous ones</title> * <title>Asynchronous operations from synchronous ones</title>
...@@ -298,8 +297,9 @@ ...@@ -298,8 +297,9 @@
* which will then dispatch the result back to the caller's * which will then dispatch the result back to the caller's
* #GMainContext when it completes. * #GMainContext when it completes.
* </para> * </para>
* <example id="gtask-run-in-thread"><title>g_task_run_in_thread()</title> *
* <programlisting> * Running a task in a thread:
* |[
* typedef struct { * typedef struct {
* guint radius; * guint radius;
* CakeFlavor flavor; * CakeFlavor flavor;
...@@ -366,8 +366,7 @@ ...@@ -366,8 +366,7 @@
* *
* return g_task_propagate_pointer (G_TASK (result), error); * return g_task_propagate_pointer (G_TASK (result), error);
* } * }
* </programlisting> * ]|
* </example>
* </refsect2> * </refsect2>
* <refsect2> * <refsect2>
* <title>Adding cancellability to uncancellable tasks</title> * <title>Adding cancellability to uncancellable tasks</title>
...@@ -384,8 +383,9 @@ ...@@ -384,8 +383,9 @@
* to make "GLib-friendly" asynchronous and cancellable * to make "GLib-friendly" asynchronous and cancellable
* synchronous variants of blocking APIs. * synchronous variants of blocking APIs.
* </para> * </para>
* <example id="gtask-cancellable"><title>g_task_set_return_on_cancel()</title> *
* <programlisting> * Cancelling a task:
* |[
* static void * static void
* bake_cake_thread (GTask *task, * bake_cake_thread (GTask *task,
* gpointer source_object, * gpointer source_object,
...@@ -474,8 +474,7 @@ ...@@ -474,8 +474,7 @@
* g_object_unref (task); * g_object_unref (task);
* return cake; * return cake;
* } * }
* </programlisting> * ]|
* </example>
* </refsect2> * </refsect2>
* <refsect2> * <refsect2>
* <title>Porting from <literal>GSimpleAsyncResult</literal></title> * <title>Porting from <literal>GSimpleAsyncResult</literal></title>
......
...@@ -349,23 +349,22 @@ _g_test_watcher_remove_pid (GPid pid) ...@@ -349,23 +349,22 @@ _g_test_watcher_remove_pid (GPid pid)
* achieve this by adding a file such as <filename>my-server.service.in</filename> * achieve this by adding a file such as <filename>my-server.service.in</filename>
* in the services * in the services
* directory and have it processed by configure. * directory and have it processed by configure.
* <informalexample><programlisting> * |[
* [D-BUS Service] * [D-BUS Service]
* Name=org.gtk.GDBus.Examples.ObjectManager * Name=org.gtk.GDBus.Examples.ObjectManager
* Exec=@abs_top_builddir@/gio/tests/gdbus-example-objectmanager-server * Exec=@abs_top_builddir@/gio/tests/gdbus-example-objectmanager-server
* </programlisting></informalexample> * ]|
* You will also need to indicate this service directory in your test * You will also need to indicate this service directory in your test
* fixtures, so you will need to pass the path while compiling your * fixtures, so you will need to pass the path while compiling your
* test cases. Typically this is done with autotools with an added * test cases. Typically this is done with autotools with an added
* preprocessor flag specified to compile your tests such as: * preprocessor flag specified to compile your tests such as:
* <informalexample><programlisting> * |[
* -DTEST_SERVICES=\""$(abs_top_builddir)/tests/services"\" * -DTEST_SERVICES=\""$(abs_top_builddir)/tests/services"\"
* </programlisting></informalexample> * ]|
* </para> * </para>
* <para> * <para>
* Once you have a service definition file which is local to your source tree, * Once you have a service definition file which is local to your source tree,
* you can proceed to set up a GTest fixture using the #GTestDBus scaffolding. * you can proceed to set up a GTest fixture using the #GTestDBus scaffolding.
* <example id="gdbus-test-fixture">
* <title>Test Fixture for D-Bus services</title> * <title>Test Fixture for D-Bus services</title>
* <programlisting> * <programlisting>
* <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../gio/tests/gdbus-test-fixture.c"> * <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" parse="text" href="../../../../gio/tests/gdbus-test-fixture.c">
...@@ -395,12 +394,12 @@ _g_test_watcher_remove_pid (GPid pid) ...@@ -395,12 +394,12 @@ _g_test_watcher_remove_pid (GPid pid)
* The GSettings schemas need to be locally pre-compiled for this to work. This can be achieved * The GSettings schemas need to be locally pre-compiled for this to work. This can be achieved
* by compiling the schemas locally as a step before running test cases, an autotools setup might * by compiling the schemas locally as a step before running test cases, an autotools setup might
* do the following in the directory holding schemas: * do the following in the directory holding schemas:
* <informalexample><programlisting> * |[
* all-am: * all-am:
* $(GLIB_COMPILE_SCHEMAS) . * $(GLIB_COMPILE_SCHEMAS) .
* *
* CLEANFILES += gschemas.compiled * CLEANFILES += gschemas.compiled
* </programlisting></informalexample> * ]|
* </para> * </para>
* </refsect2> * </refsect2>
*/ */
......
...@@ -87,7 +87,7 @@ g_volume_default_init (GVolumeInterface *iface) ...@@ -87,7 +87,7 @@ g_volume_default_init (GVolumeInterface *iface)
* GVolume::changed: * GVolume::changed:
* *
* Emitted when the volume has been changed. * Emitted when the volume has been changed.
**/ */
g_signal_new (I_("changed"), g_signal_new (I_("changed"),
G_TYPE_VOLUME, G_TYPE_VOLUME,
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
...@@ -102,7 +102,7 @@ g_volume_default_init (GVolumeInterface *iface) ...@@ -102,7 +102,7 @@ g_volume_default_init (GVolumeInterface *iface)
* This signal is emitted when the #GVolume have been removed. If * This signal is emitted when the #GVolume have been removed. If
* the recipient is holding references to the object they should * the recipient is holding references to the object they should
* release them so the object can be finalized. * release them so the object can be finalized.
**/ */
g_signal_new (I_("removed"), g_signal_new (I_("removed"),
G_TYPE_VOLUME, G_TYPE_VOLUME,
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
...@@ -114,13 +114,13 @@ g_volume_default_init (GVolumeInterface *iface) ...@@ -114,13 +114,13 @@ g_volume_default_init (GVolumeInterface *iface)
/** /**
* g_volume_get_name: * g_volume_get_name:
* @volume: a #GVolume. * @volume: a #GVolume
* *
* Gets the name of @volume. * Gets the name of @volume.
* *
* Returns: the name for the given @volume. The returned string should * Returns: the name for the given @volume. The returned string should
* be freed with g_free() when no longer needed. * be freed with g_free() when no longer needed.
**/ */
char * char *
g_volume_get_name (GVolume *volume) g_volume_get_name (GVolume *volume)
{ {
...@@ -135,14 +135,14 @@ g_volume_get_name (GVolume *volume) ...@@ -135,14 +135,14 @@ g_volume_get_name (GVolume *volume)
/** /**
* g_volume_get_icon: * g_volume_get_icon:
* @volume: a #GVolume. * @volume: a #GVolume
* *
* Gets the icon for @volume. * Gets the icon for @volume.
* *
* Returns: (transfer full): a #GIcon. * Returns: (transfer full): a #GIcon.
* The returned object should be unreffed with g_object_unref() * The returned object should be unreffed with g_object_unref()
* when no longer needed. * when no longer needed.
**/ */
GIcon * GIcon *
g_volume_get_icon (GVolume *volume) g_volume_get_icon (GVolume *volume)
{ {
...@@ -157,7 +157,7 @@ g_volume_get_icon (GVolume *volume) ...@@ -157,7 +157,7 @@ g_volume_get_icon (GVolume *volume)
/** /**
* g_volume_get_symbolic_icon: * g_volume_get_symbolic_icon:
* @volume: a #GVolume. * @volume: a #GVolume
* *
* Gets the symbolic icon for @volume. * Gets the symbolic icon for @volume.
* *
...@@ -166,7 +166,7 @@ g_volume_get_icon (GVolume *volume) ...@@ -166,7 +166,7 @@ g_volume_get_icon (GVolume *volume)
* when no longer needed. * when no longer needed.
* *
* Since: 2.34 * Since: 2.34
**/ */
GIcon * GIcon *
g_volume_get_symbolic_icon (GVolume *volume) g_volume_get_symbolic_icon (GVolume *volume)
{ {
...@@ -188,7 +188,7 @@ g_volume_get_symbolic_icon (GVolume *volume) ...@@ -188,7 +188,7 @@ g_volume_get_symbolic_icon (GVolume *volume)
/** /**
* g_volume_get_uuid: * g_volume_get_uuid:
* @volume: a #GVolume. * @volume: a #GVolume
* *
* Gets the UUID for the @volume. The reference is typically based on * Gets the UUID for the @volume. The reference is typically based on
* the file system UUID for the volume in question and should be * the file system UUID for the volume in question and should be
...@@ -198,7 +198,7 @@ g_volume_get_symbolic_icon (GVolume *volume) ...@@ -198,7 +198,7 @@ g_volume_get_symbolic_icon (GVolume *volume)
* Returns: the UUID for @volume or %NULL if no UUID can be computed. * Returns: the UUID for @volume or %NULL if no UUID can be computed.
* The returned string should be freed with g_free() * The returned string should be freed with g_free()
* when no longer needed. * when no longer needed.
**/ */
char * char *
g_volume_get_uuid (GVolume *volume) g_volume_get_uuid (GVolume *volume)
{ {
...@@ -213,14 +213,14 @@ g_volume_get_uuid (GVolume *volume) ...@@ -213,14 +213,14 @@ g_volume_get_uuid (GVolume *volume)
/** /**
* g_volume_get_drive: * g_volume_get_drive:
* @volume: a #GVolume. * @volume: a #GVolume
* *
* Gets the drive for the @volume. * Gets the drive for the @volume.
* *
* Returns: (transfer full): a #GDrive or %NULL if @volume is not associated with a drive. * Returns: (transfer full): a #GDrive or %NULL if @volume is not
* The returned object should be unreffed with g_object_unref() * associated with a drive. The returned object should be unreffed
* when no longer needed. * with g_object_unref() when no longer needed.
**/ */
GDrive *