diff options
Diffstat (limited to 'gio')
| -rw-r--r-- | gio/gappinfo.c | 6 | ||||
| -rw-r--r-- | gio/gasyncresult.c | 6 | ||||
| -rw-r--r-- | gio/gcancellable.c | 14 | ||||
| -rw-r--r-- | gio/gdbusconnection.c | 2 | ||||
| -rw-r--r-- | gio/gdbuserror.c | 11 | ||||
| -rw-r--r-- | gio/gdbusmessage.c | 26 | ||||
| -rw-r--r-- | gio/gdbusobjectmanagerserver.c | 7 | ||||
| -rw-r--r-- | gio/gdbusobjectskeleton.c | 6 | ||||
| -rw-r--r-- | gio/gdbusproxy.c | 4 | ||||
| -rw-r--r-- | gio/gemblemedicon.c | 4 | ||||
| -rw-r--r-- | gio/gfileenumerator.c | 4 | ||||
| -rw-r--r-- | gio/gfileinfo.c | 2 | ||||
| -rw-r--r-- | gio/giomodule.c | 4 | ||||
| -rw-r--r-- | gio/gsettings.c | 2 | ||||
| -rw-r--r-- | gio/gsimpleasyncresult.c | 4 | ||||
| -rw-r--r-- | gio/gsocket.c | 4 | ||||
| -rw-r--r-- | gio/gsocketconnectable.c | 22 | ||||
| -rw-r--r-- | gio/gsrvtarget.c | 4 | ||||
| -rw-r--r-- | gio/gtlscertificate.c | 2 |
19 files changed, 68 insertions, 66 deletions
diff --git a/gio/gappinfo.c b/gio/gappinfo.c index 9db559cea..abb619312 100644 --- a/gio/gappinfo.c +++ b/gio/gappinfo.c @@ -121,7 +121,7 @@ g_app_info_dup (GAppInfo *appinfo) * @appinfo1: the first #GAppInfo. * @appinfo2: the second #GAppInfo. * - * Checks if two #GAppInfo<!-- -->s are equal. + * Checks if two #GAppInfos are equal. * * Returns: %TRUE if @appinfo1 is equal to @appinfo2. %FALSE otherwise. **/ @@ -760,8 +760,8 @@ g_app_info_can_delete (GAppInfo *appinfo) * Tries to delete a #GAppInfo. * * On some platforms, there may be a difference between user-defined - * #GAppInfo<!-- -->s which can be deleted, and system-wide ones which - * cannot. See g_app_info_can_delete(). + * #GAppInfos which can be deleted, and system-wide ones which cannot. + * See g_app_info_can_delete(). * * Virtual: do_delete * Returns: %TRUE if @appinfo has been deleted diff --git a/gio/gasyncresult.c b/gio/gasyncresult.c index 628366364..eadca88d7 100644 --- a/gio/gasyncresult.c +++ b/gio/gasyncresult.c @@ -81,20 +81,20 @@ * else * g_printf ("Uh oh!\n"); * - * /<!-- -->* ... *<!-- -->/ + * ... * * } * * int main (int argc, void *argv[]) * { - * /<!-- -->* ... *<!-- -->/ + * ... * * _theoretical_frobnitz_async (theoretical_data, * NULL, * frobnitz_result_func, * NULL); * - * /<!-- -->* ... *<!-- -->/ + * ... * } * ]| * diff --git a/gio/gcancellable.c b/gio/gcancellable.c index 90d2676c1..5d9c9b67a 100644 --- a/gio/gcancellable.c +++ b/gio/gcancellable.c @@ -106,12 +106,13 @@ g_cancellable_class_init (GCancellableClass *klass) * * An example of how to us this: * |[ - * /<!-- -->* Make sure we don't do any unnecessary work if already cancelled *<!-- -->/ + * /* Make sure we don't do unnecessary work if already cancelled */ * if (g_cancellable_set_error_if_cancelled (cancellable, error)) * return; * - * /<!-- -->* Set up all the data needed to be able to - * * handle cancellation of the operation *<!-- -->/ + * /* Set up all the data needed to be able to + * * handle cancellation of the operation + * */ * my_data = my_data_new (...); * * id = 0; @@ -120,12 +121,13 @@ g_cancellable_class_init (GCancellableClass *klass) * G_CALLBACK (cancelled_handler) * data, NULL); * - * /<!-- -->* cancellable operation here... *<!-- -->/ + * /* cancellable operation here... */ * * g_cancellable_disconnect (cancellable, id); * - * /<!-- -->* cancelled_handler is never called after this, it - * * is now safe to free the data *<!-- -->/ + * /* cancelled_handler is never called after this, + * * it is now safe to free the data + * */ * my_data_free (my_data); * ]| * diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c index e825756bb..5ba1a940a 100644 --- a/gio/gdbusconnection.c +++ b/gio/gdbusconnection.c @@ -5908,7 +5908,7 @@ g_dbus_connection_call_finish (GDBusConnection *connection, * G_DBUS_CALL_FLAGS_NONE, * -1, * NULL, - * &error); + * &error); * ]| * * The calling thread is blocked until a reply is received. See diff --git a/gio/gdbuserror.c b/gio/gdbuserror.c index a358cbeda..4037f0b2b 100644 --- a/gio/gdbuserror.c +++ b/gio/gdbuserror.c @@ -336,7 +336,7 @@ static GHashTable *dbus_error_name_to_re = NULL; * @dbus_error_name: A D-Bus error name. * * Creates an association to map between @dbus_error_name and - * #GError<!-- -->s specified by @error_domain and @error_code. + * #GErrors specified by @error_domain and @error_code. * * This is typically done in the routine that returns the #GQuark for * an error domain. @@ -490,16 +490,17 @@ g_dbus_error_is_remote_error (const GError *error) /** * g_dbus_error_get_remote_error: - * @error: A #GError. + * @error: a #GError * * Gets the D-Bus error name used for @error, if any. * * This function is guaranteed to return a D-Bus error name for all - * #GError<!-- -->s returned from functions handling remote method - * calls (e.g. g_dbus_connection_call_finish()) unless + * #GErrors returned from functions handling remote method calls + * (e.g. g_dbus_connection_call_finish()) unless * g_dbus_error_strip_remote_error() has been used on @error. * - * Returns: An allocated string or %NULL if the D-Bus error name could not be found. Free with g_free(). + * Returns: an allocated string or %NULL if the D-Bus error name + * could not be found. Free with g_free(). * * Since: 2.26 */ diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c index dff5acfb6..824245eff 100644 --- a/gio/gdbusmessage.c +++ b/gio/gdbusmessage.c @@ -3350,32 +3350,32 @@ _sort_keys_func (gconstpointer a, * and formatting is subject to change at any time. Typical output * looks something like this: * |[ - * Type: method-call - * Flags: none - * Version: 0 - * Serial: 4 - * Headers: + * Type: method-call + * Flags: none + * Version: 0 + * Serial: 4 + * Headers: * path -> objectpath '/org/gtk/GDBus/TestObject' * interface -> 'org.gtk.GDBus.TestInterface' * member -> 'GimmeStdout' * destination -> ':1.146' - * Body: () + * Body: () * UNIX File Descriptors: * (none) * ]| * or * |[ - * Type: method-return - * Flags: no-reply-expected - * Version: 0 - * Serial: 477 - * Headers: + * Type: method-return + * Flags: no-reply-expected + * Version: 0 + * Serial: 477 + * Headers: * reply-serial -> uint32 4 * destination -> ':1.159' * sender -> ':1.146' * num-unix-fds -> uint32 1 - * Body: () - * UNIX File Descriptors: + * Body: () + * UNIX File Descriptors: * fd 12: dev=0:10,mode=020620,ino=5,uid=500,gid=5,rdev=136:2,size=0,atime=1273085037,mtime=1273085851,ctime=1272982635 * ]| * diff --git a/gio/gdbusobjectmanagerserver.c b/gio/gdbusobjectmanagerserver.c index 20432f748..a5dff216a 100644 --- a/gio/gdbusobjectmanagerserver.c +++ b/gio/gdbusobjectmanagerserver.c @@ -541,10 +541,9 @@ g_dbus_object_manager_server_export (GDBusObjectManagerServer *manager, * @object: An object. * * Like g_dbus_object_manager_server_export() but appends a string of - * the form <literal>_N</literal> (with N being a natural number) to - * @object<!-- -->'s object path if an object with the given path - * already exists. As such, the #GDBusObjectProxy:g-object-path property - * of @object may be modified. + * the form _N (with N being a natural number) to @object's object path + * if an object with the given path already exists. As such, the + * #GDBusObjectProxy:g-object-path property of @object may be modified. * * Since: 2.30 */ diff --git a/gio/gdbusobjectskeleton.c b/gio/gdbusobjectskeleton.c index d86cafdd0..e0d01669a 100644 --- a/gio/gdbusobjectskeleton.c +++ b/gio/gdbusobjectskeleton.c @@ -173,9 +173,9 @@ g_dbus_object_skeleton_class_init (GDBusObjectSkeletonClass *klass) * Emitted when a method is invoked by a remote caller and used to * determine if the method call is authorized. * - * This signal is like #GDBusInterfaceSkeleton<!-- -->'s - * #GDBusInterfaceSkeleton::g-authorize-method signal, except that it is - * for the enclosing object. + * This signal is like #GDBusInterfaceSkeleton's + * #GDBusInterfaceSkeleton::g-authorize-method signal, + * except that it is for the enclosing object. * * The default class handler just returns %TRUE. * diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c index d9638fe35..5df0388e3 100644 --- a/gio/gdbusproxy.c +++ b/gio/gdbusproxy.c @@ -2976,7 +2976,7 @@ g_dbus_proxy_call_sync_internal (GDBusProxy *proxy, * -1, * NULL, * (GAsyncReadyCallback) two_strings_done, - * &data); + * &data); * ]| * * If @proxy has an expected interface (see @@ -3066,7 +3066,7 @@ g_dbus_proxy_call_finish (GDBusProxy *proxy, * G_DBUS_CALL_FLAGS_NONE, * -1, * NULL, - * &error); + * &error); * ]| * * The calling thread is blocked until a reply is received. See diff --git a/gio/gemblemedicon.c b/gio/gemblemedicon.c index 6531c8050..f90af899b 100644 --- a/gio/gemblemedicon.c +++ b/gio/gemblemedicon.c @@ -196,7 +196,7 @@ g_emblemed_icon_get_icon (GEmblemedIcon *emblemed) * Gets the list of emblems for the @icon. * * Returns: (element-type Gio.Emblem) (transfer none): a #GList of - * #GEmblem <!-- -->s that is owned by @emblemed + * #GEmblems that is owned by @emblemed * * Since: 2.18 **/ @@ -250,7 +250,7 @@ g_emblem_comp (GEmblem *a, * @emblemed: a #GEmblemedIcon * @emblem: a #GEmblem * - * Adds @emblem to the #GList of #GEmblem <!-- -->s. + * Adds @emblem to the #GList of #GEmblems. * * Since: 2.18 **/ diff --git a/gio/gfileenumerator.c b/gio/gfileenumerator.c index 9146b653d..f7b8de41d 100644 --- a/gio/gfileenumerator.c +++ b/gio/gfileenumerator.c @@ -41,7 +41,7 @@ struct _GFileEnumeratorPrivate { * @short_description: Enumerated Files Routines * @include: gio/gio.h * - * #GFileEnumerator allows you to operate on a set of #GFile<!-- -->s, + * #GFileEnumerator allows you to operate on a set of #GFiles, * returning a #GFileInfo structure for each file enumerated (e.g. * g_file_enumerate_children() will return a #GFileEnumerator for each * of the children within a directory). @@ -49,7 +49,7 @@ struct _GFileEnumeratorPrivate { * To get the next file's information from a #GFileEnumerator, use * g_file_enumerator_next_file() or its asynchronous version, * g_file_enumerator_next_files_async(). Note that the asynchronous - * version will return a list of #GFileInfo<!---->s, whereas the + * version will return a list of #GFileInfos, whereas the * synchronous will only return the next file in the enumerator. * * The ordering of returned files is unspecified for non-Unix diff --git a/gio/gfileinfo.c b/gio/gfileinfo.c index dd2e2e2c4..9ded53b03 100644 --- a/gio/gfileinfo.c +++ b/gio/gfileinfo.c @@ -2285,7 +2285,7 @@ matcher_optimize (GFileAttributeMatcher *matcher) * @attributes: an attribute string to match. * * Creates a new file attribute matcher, which matches attributes - * against a given string. #GFileAttributeMatcher<!-- -->s are reference + * against a given string. #GFileAttributeMatchers are reference * counted structures, and are created with a reference count of 1. If * the number of references falls to 0, the #GFileAttributeMatcher is * automatically destroyed. diff --git a/gio/giomodule.c b/gio/giomodule.c index 4b33136d3..9b572392a 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c @@ -1227,8 +1227,8 @@ lazy_load_modules (GIOExtensionPoint *extension_point) * The list is sorted by priority, beginning with the highest priority. * * Returns: (element-type GIOExtension) (transfer none): a #GList of - * #GIOExtension<!-- -->s. The list is owned by GIO and should not be - * modified. + * #GIOExtensions. The list is owned by GIO and should not be + * modified. */ GList * g_io_extension_point_get_extensions (GIOExtensionPoint *extension_point) diff --git a/gio/gsettings.c b/gio/gsettings.c index c866b7469..941e1578b 100644 --- a/gio/gsettings.c +++ b/gio/gsettings.c @@ -637,7 +637,7 @@ g_settings_class_init (GSettingsClass *class) * GSettings::change-event: * @settings: the object on which the signal was emitted * @keys: (array length=n_keys) (element-type GQuark) (allow-none): - * an array of #GQuark<!-- -->s for the changed keys, or %NULL + * an array of #GQuarks for the changed keys, or %NULL * @n_keys: the length of the @keys array, or 0 * * The "change-event" signal is emitted once per change event that diff --git a/gio/gsimpleasyncresult.c b/gio/gsimpleasyncresult.c index f5e4b2ad8..bdda4d50b 100644 --- a/gio/gsimpleasyncresult.c +++ b/gio/gsimpleasyncresult.c @@ -41,7 +41,7 @@ * * #GSimpleAsyncResult implements #GAsyncResult. * - * GSimpleAsyncResult handles #GAsyncReadyCallback<!-- -->s, error + * GSimpleAsyncResult handles #GAsyncReadyCallbacks, error * reporting, operation cancellation and the final state of an operation, * completely transparent to the application. Results can be returned * as a pointer e.g. for functions that return data that is collected @@ -79,7 +79,7 @@ * cause a leak if cancelled before being run). * * GSimpleAsyncResult can integrate into GLib's event loop, #GMainLoop, - * or it can use #GThread<!-- -->s. + * or it can use #GThreads. * g_simple_async_result_complete() will finish an I/O task directly * from the point where it is called. g_simple_async_result_complete_in_idle() * will finish it from an idle handler in the <link diff --git a/gio/gsocket.c b/gio/gsocket.c index 49aceb2f0..a0f197140 100644 --- a/gio/gsocket.c +++ b/gio/gsocket.c @@ -103,7 +103,7 @@ * reasons. For instance, on Windows a socket is always seen as writable * until a write returns %G_IO_ERROR_WOULD_BLOCK. * - * #GSocket<!-- -->s can be either connection oriented or datagram based. + * #GSockets can be either connection oriented or datagram based. * For connection oriented types you must first establish a connection by * either connecting to an address or accepting a connection from another * address. For connectionless socket types the target/source address is @@ -3708,7 +3708,7 @@ g_socket_condition_timed_wait (GSocket *socket, * then @vectors is assumed to be terminated by a #GOutputVector with a * %NULL buffer pointer.) The #GOutputVector structs describe the buffers * that the sent data will be gathered from. Using multiple - * #GOutputVector<!-- -->s is more memory-efficient than manually copying + * #GOutputVectors is more memory-efficient than manually copying * data from multiple sources into a single buffer, and more * network-efficient than making multiple calls to g_socket_send(). * diff --git a/gio/gsocketconnectable.c b/gio/gsocketconnectable.c index e9a4a89ad..e51cf81b5 100644 --- a/gio/gsocketconnectable.c +++ b/gio/gsocketconnectable.c @@ -49,10 +49,10 @@ * enumerator = g_socket_connectable_enumerate (addr); * g_object_unref (addr); * - * /<!-- -->* Try each sockaddr until we succeed. Record the first - * * connection error, but not any further ones (since they'll probably - * * be basically the same as the first). - * *<!-- -->/ + * /* Try each sockaddr until we succeed. Record the first + * * connection error, but not any further ones (since they'll probably + * * be basically the same as the first). + * */ * while (!conn && (sockaddr = g_socket_address_enumerator_next (enumerator, cancellable, error)) * { * conn = connect_to_sockaddr (sockaddr, conn_error ? NULL : &conn_error); @@ -64,18 +64,18 @@ * { * if (conn_error) * { - * /<!-- -->* We couldn't connect to the first address, but we succeeded - * * in connecting to a later address. - * *<!-- -->/ + * /* We couldn't connect to the first address, but we succeeded + * * in connecting to a later address. + * */ * g_error_free (conn_error); * } * return conn; * } * else if (error) * { - * /<!-- -->* Either the initial lookup failed, or else the caller - * * cancelled us. - * *<!-- -->/ + * /* Either the initial lookup failed, or else the caller + * * cancelled us. + * */ * if (conn_error) * g_error_free (conn_error); * return NULL; @@ -125,7 +125,7 @@ g_socket_connectable_enumerate (GSocketConnectable *connectable) * @connectable: a #GSocketConnectable * * Creates a #GSocketAddressEnumerator for @connectable that will - * return #GProxyAddress<!-- -->es for addresses that you must connect + * return #GProxyAddresses for addresses that you must connect * to via a proxy. * * If @connectable does not implement diff --git a/gio/gsrvtarget.c b/gio/gsrvtarget.c index 3f87c94b2..1d34e5934 100644 --- a/gio/gsrvtarget.c +++ b/gio/gsrvtarget.c @@ -42,7 +42,7 @@ * then connect to whatever host was pointed to by that record. * * You can use g_resolver_lookup_service() or - * g_resolver_lookup_service_async() to find the #GSrvTarget<!-- -->s + * g_resolver_lookup_service_async() to find the #GSrvTargets * for a given service. However, if you are simply planning to connect * to the remote service, you can use #GNetworkService's * #GSocketConnectable interface and not need to worry about @@ -75,7 +75,7 @@ G_DEFINE_BOXED_TYPE (GSrvTarget, g_srv_target, * * Creates a new #GSrvTarget with the given parameters. * - * You should not need to use this; normally #GSrvTarget<!-- -->s are + * You should not need to use this; normally #GSrvTargets are * created by #GResolver. * * Return value: a new #GSrvTarget. diff --git a/gio/gtlscertificate.c b/gio/gtlscertificate.c index c6954eaa9..69115797d 100644 --- a/gio/gtlscertificate.c +++ b/gio/gtlscertificate.c @@ -446,7 +446,7 @@ g_tls_certificate_new_from_files (const gchar *cert_file, * @file: file containing PEM-encoded certificates to import * @error: #GError for error reporting, or %NULL to ignore. * - * Creates one or more #GTlsCertificate<!-- -->s from the PEM-encoded + * Creates one or more #GTlsCertificates from the PEM-encoded * data in @file. If @file cannot be read or parsed, the function will * return %NULL and set @error. If @file does not contain any * PEM-encoded certificates, this will return an empty list and not |