[glib: 1/2] minor typos in the documentation (a/an)
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 1/2] minor typos in the documentation (a/an)
- Date: Sun, 25 Aug 2019 08:09:04 +0000 (UTC)
commit 512655aa124b03c38990ce28203348939910a0a5
Author: Дилян Палаузов <git-dpa aegee org>
Date: Fri Aug 23 21:45:16 2019 +0000
minor typos in the documentation (a/an)
docs/reference/gio/migrating-gconf.xml | 2 +-
docs/reference/gio/migrating-gdbus.xml | 2 +-
docs/reference/glib/gvariant-text.xml | 2 +-
docs/reference/glib/regex-syntax.xml | 2 +-
docs/reference/gobject/tut_howto.xml | 4 ++--
gio/gaction.c | 2 +-
gio/gappinfo.c | 2 +-
gio/gconverteroutputstream.c | 4 ++--
gio/gcredentials.c | 4 ++--
gio/gdbusconnection.c | 4 ++--
gio/gdbuserror.c | 4 ++--
gio/gdbusnameowning.c | 8 ++++----
gio/gdbusnamewatching.c | 10 +++++-----
gio/gdbusnamewatching.h | 4 ++--
gio/gfile.c | 2 +-
gio/gfile.h | 6 +++---
gio/gfileinfo.c | 2 +-
gio/gmount.c | 2 +-
gio/gnativesocketaddress.c | 4 ++--
gio/gnotification.c | 2 +-
gio/gsettings.c | 2 +-
gio/gtlsinteraction.c | 2 +-
gio/inotify/inotify-kernel.c | 2 +-
gio/kqueue/dep-list.c | 6 +++---
gio/kqueue/gkqueuefilemonitor.c | 2 +-
glib/docs.c | 2 +-
glib/gbookmarkfile.c | 2 +-
glib/gchecksum.c | 4 ++--
glib/gdatetime.c | 2 +-
glib/ghash.c | 2 +-
glib/ghmac.c | 2 +-
glib/giochannel.h | 2 +-
glib/gkeyfile.c | 2 +-
glib/glib.stp.in | 2 +-
glib/grand.c | 4 ++--
glib/gregex.c | 6 +++---
glib/gshell.c | 2 +-
glib/gspawn-win32-helper.c | 2 +-
glib/gspawn-win32.c | 2 +-
glib/gstrfuncs.c | 4 ++--
glib/gtestutils.c | 4 ++--
glib/gtimezone.c | 2 +-
glib/guniprop.c | 2 +-
glib/gutf8.c | 2 +-
glib/gvariant-parser.c | 2 +-
glib/gvariant.c | 6 +++---
glib/gvarianttypeinfo.c | 4 ++--
glib/tests/option-context.c | 4 ++--
gobject/gatomicarray.c | 2 +-
gobject/gmarshal.c | 2 +-
gobject/gobject.c | 2 +-
gobject/gtype.c | 4 ++--
gobject/gvalue.c | 2 +-
53 files changed, 82 insertions(+), 82 deletions(-)
---
diff --git a/docs/reference/gio/migrating-gconf.xml b/docs/reference/gio/migrating-gconf.xml
index b1a491f16..12176a6d7 100644
--- a/docs/reference/gio/migrating-gconf.xml
+++ b/docs/reference/gio/migrating-gconf.xml
@@ -134,7 +134,7 @@
<section><title>Change sets</title>
<para>
- GConf has a a concept of a set of changes which can be applied or reverted
+ GConf has a concept of a set of changes which can be applied or reverted
at once: #GConfChangeSet (GConf doesn't actually apply changes atomically,
which is one of its shortcomings).
</para>
diff --git a/docs/reference/gio/migrating-gdbus.xml b/docs/reference/gio/migrating-gdbus.xml
index 5205a7cdb..7595aaa02 100644
--- a/docs/reference/gio/migrating-gdbus.xml
+++ b/docs/reference/gio/migrating-gdbus.xml
@@ -12,7 +12,7 @@
<para>
The central concepts of D-Bus are modelled in a very similar way
- in dbus-glib and GDBus. Both have a objects representing connections,
+ in dbus-glib and GDBus. Both have objects representing connections,
proxies and method invocations. But there are some important
differences:
<itemizedlist>
diff --git a/docs/reference/glib/gvariant-text.xml b/docs/reference/glib/gvariant-text.xml
index 90da39c55..7a61c19da 100644
--- a/docs/reference/glib/gvariant-text.xml
+++ b/docs/reference/glib/gvariant-text.xml
@@ -38,7 +38,7 @@
<informalexample><programlisting>[[1, 2, 3], [4, 5, 6.0]]</programlisting></informalexample>
- is parsed as a array of arrays of doubles (type '<literal>aad</literal>').
+ is parsed as an array of arrays of doubles (type '<literal>aad</literal>').
</para>
<para>
diff --git a/docs/reference/glib/regex-syntax.xml b/docs/reference/glib/regex-syntax.xml
index 6cfb132d3..4cff1796b 100644
--- a/docs/reference/glib/regex-syntax.xml
+++ b/docs/reference/glib/regex-syntax.xml
@@ -2177,7 +2177,7 @@ written like this (ignore whitespace and line breaks):
</programlisting>
<para>
-The first part of the pattern is a DEFINE group inside which a another group
+The first part of the pattern is a DEFINE group inside which another group
named "byte" is defined. This matches an individual component of an IPv4
address (a number less than 256). When matching takes place, this part of the
pattern is skipped because DEFINE acts like a false condition.
diff --git a/docs/reference/gobject/tut_howto.xml b/docs/reference/gobject/tut_howto.xml
index 0c0393da6..bfb8d95c5 100644
--- a/docs/reference/gobject/tut_howto.xml
+++ b/docs/reference/gobject/tut_howto.xml
@@ -379,7 +379,7 @@ viewer_file_class_init (ViewerFileClass *klass)
</para>
<para>
- Some people sometimes need to complete the initialization of a instance
+ Some people sometimes need to complete the initialization of an instance
of a type only after the properties passed to the constructors have been
set. This is possible through the use of the <function>constructor()</function>
class method as described in <xref linkend="gobject-instantiation"/> or,
@@ -1381,7 +1381,7 @@ viewer_audio_file_init (ViewerAudioFile *self)
<para>
To call the base class implementation of an interface
- method from an derived class where than interface method has been
+ method from a derived class where than interface method has been
overridden, stash away the pointer returned from
<function><link linkend="g-type-interface-peek-parent">g_type_interface_peek_parent</link></function>
in a global variable.
diff --git a/gio/gaction.c b/gio/gaction.c
index 3b63de6c3..c3748a902 100644
--- a/gio/gaction.c
+++ b/gio/gaction.c
@@ -403,7 +403,7 @@ g_action_activate (GAction *action,
/**
* g_action_name_is_valid:
- * @action_name: an potential action name
+ * @action_name: a potential action name
*
* Checks if @action_name is valid.
*
diff --git a/gio/gappinfo.c b/gio/gappinfo.c
index 6f2b72c4e..1dafc78fe 100644
--- a/gio/gappinfo.c
+++ b/gio/gappinfo.c
@@ -54,7 +54,7 @@
* As of GLib 2.20, URIs will always be converted to POSIX paths
* (using g_file_get_path()) when using g_app_info_launch() even if
* the application requested an URI and not a POSIX path. For example
- * for an desktop-file based application with Exec key `totem
+ * for a desktop-file based application with Exec key `totem
* %U` and a single URI, `sftp://foo/file.avi`, then
* `/home/user/.gvfs/sftp on foo/file.avi` will be passed. This will
* only work if a set of suitable GIO extensions (such as gvfs 2.26
diff --git a/gio/gconverteroutputstream.c b/gio/gconverteroutputstream.c
index 00ee641da..bb3d94a03 100644
--- a/gio/gconverteroutputstream.c
+++ b/gio/gconverteroutputstream.c
@@ -485,7 +485,7 @@ write_internal (GOutputStream *stream,
if (converted_bytes > 0)
{
- /* We got an conversion error, but we did convert some bytes before
+ /* We got a conversion error, but we did convert some bytes before
that, so handle those before reporting the error */
g_error_free (my_error);
break;
@@ -505,7 +505,7 @@ write_internal (GOutputStream *stream,
return count; /* consume everything */
}
- /* Converted no data and got an normal error, return it */
+ /* Converted no data and got a normal error, return it */
g_propagate_error (error, my_error);
return -1;
}
diff --git a/gio/gcredentials.c b/gio/gcredentials.c
index cc0cd82ce..57a39f2a2 100644
--- a/gio/gcredentials.c
+++ b/gio/gcredentials.c
@@ -363,7 +363,7 @@ credentials_native_type_check (GCredentialsType requested_type,
* Gets a pointer to native credentials of type @native_type from
* @credentials.
*
- * It is a programming error (which will cause an warning to be
+ * It is a programming error (which will cause a warning to be
* logged) to use this method if there is no #GCredentials support for
* the OS or if @native_type isn't supported by the OS.
*
@@ -401,7 +401,7 @@ g_credentials_get_native (GCredentials *credentials,
* Copies the native credentials of type @native_type from @native
* into @credentials.
*
- * It is a programming error (which will cause an warning to be
+ * It is a programming error (which will cause a warning to be
* logged) to use this method if there is no #GCredentials support for
* the OS or if @native_type isn't supported by the OS.
*
diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index 6ae1e21ce..f1f0921d4 100644
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@ -2672,7 +2672,7 @@ async_initable_iface_init (GAsyncInitableIface *async_initable_iface)
/**
* g_dbus_connection_new:
* @stream: a #GIOStream
- * @guid: (nullable): the GUID to use if a authenticating as a server or %NULL
+ * @guid: (nullable): the GUID to use if authenticating as a server or %NULL
* @flags: flags describing how to make the connection
* @observer: (nullable): a #GDBusAuthObserver or %NULL
* @cancellable: (nullable): a #GCancellable or %NULL
@@ -2765,7 +2765,7 @@ g_dbus_connection_new_finish (GAsyncResult *res,
/**
* g_dbus_connection_new_sync:
* @stream: a #GIOStream
- * @guid: (nullable): the GUID to use if a authenticating as a server or %NULL
+ * @guid: (nullable): the GUID to use if authenticating as a server or %NULL
* @flags: flags describing how to make the connection
* @observer: (nullable): a #GDBusAuthObserver or %NULL
* @cancellable: (nullable): a #GCancellable or %NULL
diff --git a/gio/gdbuserror.c b/gio/gdbuserror.c
index f2778d2d0..682677354 100644
--- a/gio/gdbuserror.c
+++ b/gio/gdbuserror.c
@@ -335,7 +335,7 @@ static GHashTable *dbus_error_name_to_re = NULL;
/**
* g_dbus_error_register_error:
- * @error_domain: A #GQuark for a error domain.
+ * @error_domain: A #GQuark for an error domain.
* @error_code: An error code.
* @dbus_error_name: A D-Bus error name.
*
@@ -401,7 +401,7 @@ g_dbus_error_register_error (GQuark error_domain,
/**
* g_dbus_error_unregister_error:
- * @error_domain: A #GQuark for a error domain.
+ * @error_domain: A #GQuark for an error domain.
* @error_code: An error code.
* @dbus_error_name: A D-Bus error name.
*
diff --git a/gio/gdbusnameowning.c b/gio/gdbusnameowning.c
index 2c2714db2..9764f2476 100644
--- a/gio/gdbusnameowning.c
+++ b/gio/gdbusnameowning.c
@@ -510,7 +510,7 @@ connection_get_cb (GObject *source_object,
* Like g_bus_own_name() but takes a #GDBusConnection instead of a
* #GBusType.
*
- * Returns: an identifier (never 0) that an be used with
+ * Returns: an identifier (never 0) that can be used with
* g_bus_unown_name() to stop owning the name
*
* Since: 2.26
@@ -620,7 +620,7 @@ g_bus_own_name_on_connection (GDBusConnection *connection,
* Simply register objects to be exported in @bus_acquired_handler and
* unregister the objects (if any) in @name_lost_handler.
*
- * Returns: an identifier (never 0) that an be used with
+ * Returns: an identifier (never 0) that can be used with
* g_bus_unown_name() to stop owning the name.
*
* Since: 2.26
@@ -805,7 +805,7 @@ bus_own_name_free_func (gpointer user_data)
* Version of g_bus_own_name() using closures instead of callbacks for
* easier binding in other languages.
*
- * Returns: an identifier (never 0) that an be used with
+ * Returns: an identifier (never 0) that can be used with
* g_bus_unown_name() to stop owning the name.
*
* Since: 2.26
@@ -843,7 +843,7 @@ g_bus_own_name_with_closures (GBusType bus_type,
* Version of g_bus_own_name_on_connection() using closures instead of
* callbacks for easier binding in other languages.
*
- * Returns: an identifier (never 0) that an be used with
+ * Returns: an identifier (never 0) that can be used with
* g_bus_unown_name() to stop owning the name.
*
* Since: 2.26
diff --git a/gio/gdbusnamewatching.c b/gio/gdbusnamewatching.c
index dad8e75ec..3a97c50ee 100644
--- a/gio/gdbusnamewatching.c
+++ b/gio/gdbusnamewatching.c
@@ -553,7 +553,7 @@ connection_get_cb (GObject *source_object,
*
* Starts watching @name on the bus specified by @bus_type and calls
* @name_appeared_handler and @name_vanished_handler when the name is
- * known to have a owner respectively known to lose its
+ * known to have an owner respectively known to lose its
* owner. Callbacks will be invoked in the
* [thread-default main context][g-main-context-push-thread-default]
* of the thread you are calling this function from.
@@ -581,7 +581,7 @@ connection_get_cb (GObject *source_object,
* @name_appeared_handler and destroy them again (if any) in
* @name_vanished_handler.
*
- * Returns: An identifier (never 0) that an be used with
+ * Returns: An identifier (never 0) that can be used with
* g_bus_unwatch_name() to stop watching the name.
*
* Since: 2.26
@@ -643,7 +643,7 @@ g_bus_watch_name (GBusType bus_type,
* Like g_bus_watch_name() but takes a #GDBusConnection instead of a
* #GBusType.
*
- * Returns: An identifier (never 0) that an be used with
+ * Returns: An identifier (never 0) that can be used with
* g_bus_unwatch_name() to stop watching the name.
*
* Since: 2.26
@@ -793,7 +793,7 @@ bus_watch_name_free_func (gpointer user_data)
* Version of g_bus_watch_name() using closures instead of callbacks for
* easier binding in other languages.
*
- * Returns: An identifier (never 0) that an be used with
+ * Returns: An identifier (never 0) that can be used with
* g_bus_unwatch_name() to stop watching the name.
*
* Since: 2.26
@@ -827,7 +827,7 @@ g_bus_watch_name_with_closures (GBusType bus_type,
* Version of g_bus_watch_name_on_connection() using closures instead of callbacks for
* easier binding in other languages.
*
- * Returns: An identifier (never 0) that an be used with
+ * Returns: An identifier (never 0) that can be used with
* g_bus_unwatch_name() to stop watching the name.
*
* Since: 2.26
diff --git a/gio/gdbusnamewatching.h b/gio/gdbusnamewatching.h
index 491e21e21..19d57f2c5 100644
--- a/gio/gdbusnamewatching.h
+++ b/gio/gdbusnamewatching.h
@@ -36,7 +36,7 @@ G_BEGIN_DECLS
* @name_owner: Unique name of the owner of the name being watched.
* @user_data: User data passed to g_bus_watch_name().
*
- * Invoked when the name being watched is known to have to have a owner.
+ * Invoked when the name being watched is known to have to have an owner.
*
* Since: 2.26
*/
@@ -52,7 +52,7 @@ typedef void (*GBusNameAppearedCallback) (GDBusConnection *connection,
* @name: The name being watched.
* @user_data: User data passed to g_bus_watch_name().
*
- * Invoked when the name being watched is known not to have to have a owner.
+ * Invoked when the name being watched is known not to have to have an owner.
*
* This is also invoked when the #GDBusConnection on which the watch was
* established has been closed. In that case, @connection will be
diff --git a/gio/gfile.c b/gio/gfile.c
index 45777a61d..321153e87 100644
--- a/gio/gfile.c
+++ b/gio/gfile.c
@@ -8220,7 +8220,7 @@ g_file_stop_mountable (GFile *file,
* @result: a #GAsyncResult
* @error: a #GError, or %NULL
*
- * Finishes an stop operation, see g_file_stop_mountable() for details.
+ * Finishes a stop operation, see g_file_stop_mountable() for details.
*
* Finish an asynchronous stop operation that was started
* with g_file_stop_mountable().
diff --git a/gio/gfile.h b/gio/gfile.h
index 9c9ea9572..8441d0bd1 100644
--- a/gio/gfile.h
+++ b/gio/gfile.h
@@ -140,16 +140,16 @@ typedef struct _GFileIface GFileIface;
* @replace_readwrite_async: Asynchronously replaces file read/write. Since 2.22.
* @replace_readwrite_finish: Finishes an asynchronous replace read/write. Since 2.22.
* @start_mountable: Starts a mountable object. Since 2.22.
- * @start_mountable_finish: Finishes an start operation. Since 2.22.
+ * @start_mountable_finish: Finishes a start operation. Since 2.22.
* @stop_mountable: Stops a mountable. Since 2.22.
- * @stop_mountable_finish: Finishes an stop operation. Since 2.22.
+ * @stop_mountable_finish: Finishes a stop operation. Since 2.22.
* @supports_thread_contexts: a boolean that indicates whether the #GFile implementation supports
thread-default contexts. Since 2.22.
* @unmount_mountable_with_operation: Unmounts a mountable object using a #GMountOperation. Since 2.22.
* @unmount_mountable_with_operation_finish: Finishes an unmount operation using a #GMountOperation. Since
2.22.
* @eject_mountable_with_operation: Ejects a mountable object using a #GMountOperation. Since 2.22.
* @eject_mountable_with_operation_finish: Finishes an eject operation using a #GMountOperation. Since 2.22.
* @poll_mountable: Polls a mountable object for media changes. Since 2.22.
- * @poll_mountable_finish: Finishes an poll operation for media changes. Since 2.22.
+ * @poll_mountable_finish: Finishes a poll operation for media changes. Since 2.22.
* @measure_disk_usage: Recursively measures the disk usage of @file. Since 2.38
* @measure_disk_usage_async: Asynchronously recursively measures the disk usage of @file. Since 2.38
* @measure_disk_usage_finish: Finishes an asynchronous recursive measurement of the disk usage of @file.
Since 2.38
diff --git a/gio/gfileinfo.c b/gio/gfileinfo.c
index 8c1d6c67f..65788d088 100644
--- a/gio/gfileinfo.c
+++ b/gio/gfileinfo.c
@@ -1049,7 +1049,7 @@ g_file_info_get_attribute_uint64 (GFileInfo *info,
* @attribute: a file attribute key.
*
* Gets a signed 64-bit integer contained within the attribute. If the
- * attribute does not contain an signed 64-bit integer, or is invalid,
+ * attribute does not contain a signed 64-bit integer, or is invalid,
* 0 will be returned.
*
* Returns: a signed 64-bit integer from the attribute.
diff --git a/gio/gmount.c b/gio/gmount.c
index 55caaa6bd..8dfa1d7c2 100644
--- a/gio/gmount.c
+++ b/gio/gmount.c
@@ -865,7 +865,7 @@ g_mount_guess_content_type_finish (GMount *mount,
* [shared-mime-info](http://www.freedesktop.org/wiki/Specifications/shared-mime-info-spec)
* specification for more on x-content types.
*
- * This is an synchronous operation and as such may block doing IO;
+ * This is a synchronous operation and as such may block doing IO;
* see g_mount_guess_content_type() for the asynchronous version.
*
* Returns: (transfer full) (element-type utf8): a %NULL-terminated array of content types or %NULL on error.
diff --git a/gio/gnativesocketaddress.c b/gio/gnativesocketaddress.c
index 21106348f..ac2ce62d2 100644
--- a/gio/gnativesocketaddress.c
+++ b/gio/gnativesocketaddress.c
@@ -34,13 +34,13 @@
* @short_description: Native GSocketAddress
* @include: gio/gio.h
*
- * An socket address of some unknown native type.
+ * A socket address of some unknown native type.
*/
/**
* GNativeSocketAddress:
*
- * An socket address, corresponding to a general struct
+ * A socket address, corresponding to a general struct
* sockadd address of a type not otherwise handled by glib.
*/
diff --git a/gio/gnotification.c b/gio/gnotification.c
index 8e837ed03..27efed3f4 100644
--- a/gio/gnotification.c
+++ b/gio/gnotification.c
@@ -728,7 +728,7 @@ g_notification_get_priority_nick (GNotification *notification)
/*< private >
* g_notification_serialize:
*
- * Serializes @notification into an floating variant of type a{sv}.
+ * Serializes @notification into a floating variant of type a{sv}.
*
* Returns: the serialized @notification as a floating variant.
*/
diff --git a/gio/gsettings.c b/gio/gsettings.c
index 6272cce51..1e46d5ae5 100644
--- a/gio/gsettings.c
+++ b/gio/gsettings.c
@@ -1442,7 +1442,7 @@ g_settings_set_enum (GSettings *settings,
* to the flags value that it represents.
*
* In order to use this function the type of the value must be an array
- * of strings and it must be marked in the schema file as an flags type.
+ * of strings and it must be marked in the schema file as a flags type.
*
* It is a programmer error to give a @key that isn't contained in the
* schema for @settings or is not marked as a flags type.
diff --git a/gio/gtlsinteraction.c b/gio/gtlsinteraction.c
index 85e2e5afc..dfb54f66e 100644
--- a/gio/gtlsinteraction.c
+++ b/gio/gtlsinteraction.c
@@ -805,7 +805,7 @@ g_tls_interaction_request_certificate_async (GTlsInteraction *inter
* @result: the result passed to the callback
* @error: an optional location to place an error on failure
*
- * Complete an request certificate user interaction request. This should be once
+ * Complete a request certificate user interaction request. This should be once
* the g_tls_interaction_request_certificate_async() completion callback is called.
*
* If %G_TLS_INTERACTION_HANDLED is returned, then the #GTlsConnection
diff --git a/gio/inotify/inotify-kernel.c b/gio/inotify/inotify-kernel.c
index 881cbfc5a..05cdcb1aa 100644
--- a/gio/inotify/inotify-kernel.c
+++ b/gio/inotify/inotify-kernel.c
@@ -338,7 +338,7 @@ ik_source_dispatch (GSource *source,
* when the timeout is reached on an unpaired move (if any).
*
* If the last event was uninteresting then we will wake up after the
- * shorter of the boredom sleep or any timeout for a unpaired move.
+ * shorter of the boredom sleep or any timeout for an unpaired move.
*/
if (interesting)
{
diff --git a/gio/kqueue/dep-list.c b/gio/kqueue/dep-list.c
index d8c3d8a01..3e7976539 100644
--- a/gio/kqueue/dep-list.c
+++ b/gio/kqueue/dep-list.c
@@ -361,7 +361,7 @@ G_STMT_START { \
*
* @param[in,out] removed A list of the removed files in the directory.
* @param[in,out] added A list of the added files of the directory.
- * @param[in] cbs A pointer to #traverse_cbs, an user-defined set of
+ * @param[in] cbs A pointer to #traverse_cbs, a user-defined set of
* traverse callbacks.
* @param[in] udata A pointer to the user-defined data.
* @return 0 if no files were renamed, >0 otherwise.
@@ -402,7 +402,7 @@ dl_detect_moves (dep_list **removed,
*
* @param[in,out] removed A list of the removed files in the directory.
* @param[in,out] current A list with the current contents of the directory.
- * @param[in] cbs A pointer to #traverse_cbs, an user-defined set of
+ * @param[in] cbs A pointer to #traverse_cbs, a user-defined set of
* traverse callbacks.
* @param[in] udata A pointer to the user-defined data.
* @return 0 if no files were renamed, >0 otherwise.
@@ -447,7 +447,7 @@ dl_detect_replacements (dep_list **removed,
*
* @param[in,out] previous A list with the previous contents of the directory.
* @param[in,out] current A list with the current contents of the directory.
- * @param[in] cbs A pointer to #traverse_cbs, an user-defined set of
+ * @param[in] cbs A pointer to #traverse_cbs, a user-defined set of
* traverse callbacks.
* @param[in] udata A pointer to the user-defined data.
* @return 0 if no files were renamed, >0 otherwise.
diff --git a/gio/kqueue/gkqueuefilemonitor.c b/gio/kqueue/gkqueuefilemonitor.c
index 67fafe1d9..3055506a9 100644
--- a/gio/kqueue/gkqueuefilemonitor.c
+++ b/gio/kqueue/gkqueuefilemonitor.c
@@ -265,7 +265,7 @@ g_kqueue_file_monitor_start (GLocalFileMonitor *local_monitor,
/* For a directory monitor, create a subscription object anyway.
* It will be used for directory diff calculation routines.
* Wait, directory diff in a GKqueueFileMonitor?
- * Yes, it is. When a file monitor is started on an non-existent
+ * Yes, it is. When a file monitor is started on a non-existent
* file, GIO uses a GKqueueFileMonitor object for that. If a directory
* will be created under that path, GKqueueFileMonitor will have to
* handle the directory notifications. */
diff --git a/glib/docs.c b/glib/docs.c
index 89b1d5253..699e73a08 100644
--- a/glib/docs.c
+++ b/glib/docs.c
@@ -1979,7 +1979,7 @@
* @major: major version to check against
* @minor: minor version to check against
*
- * Expands to a a check for a compiler with __GNUC__ defined and a version
+ * Expands to a check for a compiler with __GNUC__ defined and a version
* greater than or equal to the major and minor numbers provided. For example,
* the following would only match on compilers such as GCC 4.8 or newer.
*
diff --git a/glib/gbookmarkfile.c b/glib/gbookmarkfile.c
index 88808e72b..25f1234d7 100644
--- a/glib/gbookmarkfile.c
+++ b/glib/gbookmarkfile.c
@@ -203,7 +203,7 @@ struct _GBookmarkFile
gchar *description;
/* we store our items in a list and keep a copy inside
- * an hash table for faster lookup performances
+ * a hash table for faster lookup performances
*/
GList *items;
GHashTable *items_by_uri;
diff --git a/glib/gchecksum.c b/glib/gchecksum.c
index f55a871ba..1ad21fff8 100644
--- a/glib/gchecksum.c
+++ b/glib/gchecksum.c
@@ -462,7 +462,7 @@ md5_sum_digest (Md5sum *md5,
/* The following implementation comes from D-Bus dbus-sha.c. I've changed
* it to use GLib types and to work more like the MD5 implementation above.
- * I left the comments to have an history of this code.
+ * I left the comments to have a history of this code.
* -- Emmanuele Bassi, ebassi gnome org
*/
@@ -1623,7 +1623,7 @@ g_checksum_update (GChecksum *checksum,
* g_checksum_get_string:
* @checksum: a #GChecksum
*
- * Gets the digest as an hexadecimal string.
+ * Gets the digest as a hexadecimal string.
*
* Once this function has been called the #GChecksum can no longer be
* updated with g_checksum_update().
diff --git a/glib/gdatetime.c b/glib/gdatetime.c
index 58874ad2a..f5e12c1bf 100644
--- a/glib/gdatetime.c
+++ b/glib/gdatetime.c
@@ -747,7 +747,7 @@ g_date_time_to_instant (GDateTime *datetime)
/*< internal >
* g_date_time_from_instant:
* @tz: a #GTimeZone
- * @instant: a instant in time
+ * @instant: an instant in time
*
* Creates a #GDateTime from a time zone and an instant.
*
diff --git a/glib/ghash.c b/glib/ghash.c
index c7b7139a3..e61b03788 100644
--- a/glib/ghash.c
+++ b/glib/ghash.c
@@ -98,7 +98,7 @@
* To remove a key and value, use g_hash_table_remove().
*
* To call a function for each key and value pair use
- * g_hash_table_foreach() or use a iterator to iterate over the
+ * g_hash_table_foreach() or use an iterator to iterate over the
* key/value pairs in the hash table, see #GHashTableIter.
*
* To destroy a #GHashTable use g_hash_table_destroy().
diff --git a/glib/ghmac.c b/glib/ghmac.c
index af9b6744a..49fd272f0 100644
--- a/glib/ghmac.c
+++ b/glib/ghmac.c
@@ -265,7 +265,7 @@ g_hmac_update (GHmac *hmac,
* g_hmac_get_string:
* @hmac: a #GHmac
*
- * Gets the HMAC as an hexadecimal string.
+ * Gets the HMAC as a hexadecimal string.
*
* Once this function has been called the #GHmac can no longer be
* updated with g_hmac_update().
diff --git a/glib/giochannel.h b/glib/giochannel.h
index 1da90ef6d..82743602a 100644
--- a/glib/giochannel.h
+++ b/glib/giochannel.h
@@ -345,7 +345,7 @@ void g_io_channel_win32_make_pollfd (GIOChannel *channel,
GIOCondition condition,
GPollFD *fd);
-/* This can be used to wait a until at least one of the channels is readable.
+/* This can be used to wait until at least one of the channels is readable.
* On Unix you would do a select() on the file descriptors of the channels.
*/
GLIB_AVAILABLE_IN_ALL
diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
index 41883e968..e486f6928 100644
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
@@ -3119,7 +3119,7 @@ g_key_file_get_double (GKeyFile *key_file,
* @key_file: a #GKeyFile
* @group_name: a group name
* @key: a key
- * @value: an double value
+ * @value: a double value
*
* Associates a new double value with @key under @group_name.
* If @key cannot be found then it is created.
diff --git a/glib/glib.stp.in b/glib/glib.stp.in
index 0577d8ca2..5714fc171 100644
--- a/glib/glib.stp.in
+++ b/glib/glib.stp.in
@@ -450,7 +450,7 @@ probe glib.timeout_add = process("@ABS_GLIB_RUNTIME_LIBDIR@/libglib-2.0.so.0.@LT
}
/**
- * probe glib.timeout_dispatch - Called when an timeout #GSource is dispatched
+ * probe glib.timeout_dispatch - Called when a timeout #GSource is dispatched
* @source: the timeout #GSource
* @context: the #GMainContext the timeout source was in
* @func: the timeout callback function
diff --git a/glib/grand.c b/glib/grand.c
index 19339afc6..b5b1b71f6 100644
--- a/glib/grand.c
+++ b/glib/grand.c
@@ -434,7 +434,7 @@ g_rand_set_seed_array (GRand *rand,
* @rand_: a #GRand
*
* Returns a random #gboolean from @rand_.
- * This corresponds to a unbiased coin toss.
+ * This corresponds to an unbiased coin toss.
*
* Returns: a random #gboolean
*/
@@ -634,7 +634,7 @@ get_global_random (void)
* g_random_boolean:
*
* Returns a random #gboolean.
- * This corresponds to a unbiased coin toss.
+ * This corresponds to an unbiased coin toss.
*
* Returns: a random #gboolean
*/
diff --git a/glib/gregex.c b/glib/gregex.c
index f004c1f8a..cef091ed9 100644
--- a/glib/gregex.c
+++ b/glib/gregex.c
@@ -2054,7 +2054,7 @@ g_regex_get_string_number (const GRegex *regex,
* As a special case, the result of splitting the empty string ""
* is an empty vector, not a vector containing a single string.
* The reason for this special case is that being able to represent
- * a empty vector is typically more useful than consistent handling
+ * an empty vector is typically more useful than consistent handling
* of empty elements. If you do need to represent empty elements,
* you'll need to check for the empty string before calling this
* function.
@@ -2101,7 +2101,7 @@ g_regex_split_simple (const gchar *pattern,
*
* As a special case, the result of splitting the empty string "" is an
* empty vector, not a vector containing a single string. The reason for
- * this special case is that being able to represent a empty vector is
+ * this special case is that being able to represent an empty vector is
* typically more useful than consistent handling of empty elements. If
* you do need to represent empty elements, you'll need to check for the
* empty string before calling this function.
@@ -2144,7 +2144,7 @@ g_regex_split (const GRegex *regex,
*
* As a special case, the result of splitting the empty string "" is an
* empty vector, not a vector containing a single string. The reason for
- * this special case is that being able to represent a empty vector is
+ * this special case is that being able to represent an empty vector is
* typically more useful than consistent handling of empty elements. If
* you do need to represent empty elements, you'll need to check for the
* empty string before calling this function.
diff --git a/glib/gshell.c b/glib/gshell.c
index aabf7bcb5..0c6dc85f1 100644
--- a/glib/gshell.c
+++ b/glib/gshell.c
@@ -221,7 +221,7 @@ g_shell_quote (const gchar *unquoted_string)
*/
while (*p)
{
- /* Replace literal ' with a close ', a \', and a open ' */
+ /* Replace literal ' with a close ', a \', and an open ' */
if (*p == '\'')
g_string_append (dest, "'\\''");
else
diff --git a/glib/gspawn-win32-helper.c b/glib/gspawn-win32-helper.c
index d082de279..293d6c0a8 100644
--- a/glib/gspawn-win32-helper.c
+++ b/glib/gspawn-win32-helper.c
@@ -82,7 +82,7 @@ protect_wargv (gint argc,
* rather different than what Unix shells do. See stdargv.c in the C
* runtime sources (in the Platform SDK, in src/crt).
*
- * Note that an new_wargv[0] constructed by this function should
+ * Note that a new_wargv[0] constructed by this function should
* *not* be passed as the filename argument to a _wspawn* or _wexec*
* family function. That argument should be the real file name
* without any quoting.
diff --git a/glib/gspawn-win32.c b/glib/gspawn-win32.c
index 8f998d927..c1b024c03 100644
--- a/glib/gspawn-win32.c
+++ b/glib/gspawn-win32.c
@@ -207,7 +207,7 @@ protect_argv (gchar **argv,
* rather different than what Unix shells do. See stdargv.c in the C
* runtime sources (in the Platform SDK, in src/crt).
*
- * Note that an new_argv[0] constructed by this function should
+ * Note that a new_argv[0] constructed by this function should
* *not* be passed as the filename argument to a spawn* or exec*
* family function. That argument should be the real file name
* without any quoting.
diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 17e10a72d..a37ef899c 100644
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -2331,7 +2331,7 @@ g_strchomp (gchar *string)
*
* As a special case, the result of splitting the empty string "" is an empty
* vector, not a vector containing a single string. The reason for this
- * special case is that being able to represent a empty vector is typically
+ * special case is that being able to represent an empty vector is typically
* more useful than consistent handling of empty elements. If you do need
* to represent empty elements, you'll need to check for the empty string
* before calling g_strsplit().
@@ -2413,7 +2413,7 @@ g_strsplit (const gchar *string,
*
* As a special case, the result of splitting the empty string "" is an empty
* vector, not a vector containing a single string. The reason for this
- * special case is that being able to represent a empty vector is typically
+ * special case is that being able to represent an empty vector is typically
* more useful than consistent handling of empty elements. If you do need
* to represent empty elements, you'll need to check for the empty string
* before calling g_strsplit_set().
diff --git a/glib/gtestutils.c b/glib/gtestutils.c
index 80f7b4961..dd789482f 100644
--- a/glib/gtestutils.c
+++ b/glib/gtestutils.c
@@ -627,7 +627,7 @@
/**
* g_assert_cmpfloat:
- * @n1: an floating point number
+ * @n1: a floating point number
* @cmp: The comparison operator to use.
* One of `==`, `!=`, `<`, `>`, `<=`, `>=`.
* @n2: another floating point number
@@ -644,7 +644,7 @@
/**
* g_assert_cmpfloat_with_epsilon:
- * @n1: an floating point number
+ * @n1: a floating point number
* @n2: another floating point number
* @epsilon: a numeric value that expresses the expected tolerance
* between @n1 and @n2
diff --git a/glib/gtimezone.c b/glib/gtimezone.c
index 26a563403..9206388e3 100644
--- a/glib/gtimezone.c
+++ b/glib/gtimezone.c
@@ -1936,7 +1936,7 @@ g_time_zone_adjust_time (GTimeZone *tz,
* @type: the #GTimeType of @time_
* @time_: a number of seconds since January 1, 1970
*
- * Finds an the interval within @tz that corresponds to the given @time_.
+ * Finds an interval within @tz that corresponds to the given @time_.
* The meaning of @time_ depends on @type.
*
* If @type is %G_TIME_TYPE_UNIVERSAL then this function will always
diff --git a/glib/guniprop.c b/glib/guniprop.c
index 9f67d9a4e..3d876a5ea 100644
--- a/glib/guniprop.c
+++ b/glib/guniprop.c
@@ -535,7 +535,7 @@ g_unichar_iswide_cjk (gunichar c)
* Converts a character to uppercase.
*
* Returns: the result of converting @c to uppercase.
- * If @c is not an lowercase or titlecase character,
+ * If @c is not a lowercase or titlecase character,
* or has no upper case equivalent @c is returned unchanged.
**/
gunichar
diff --git a/glib/gutf8.c b/glib/gutf8.c
index fe0f8ab14..cba97db7d 100644
--- a/glib/gutf8.c
+++ b/glib/gutf8.c
@@ -382,7 +382,7 @@ g_utf8_offset_to_pointer (const gchar *str,
* @str: a UTF-8 encoded string
* @pos: a pointer to a position within @str
*
- * Converts from a pointer to position within a string to a integer
+ * Converts from a pointer to position within a string to an integer
* character offset.
*
* Since 2.10, this function allows @pos to be before @str, and returns
diff --git a/glib/gvariant-parser.c b/glib/gvariant-parser.c
index 589fe3f4f..5e96c1321 100644
--- a/glib/gvariant-parser.c
+++ b/glib/gvariant-parser.c
@@ -2813,7 +2813,7 @@ g_variant_parse_error_print_context (GError *error,
/* the error is at the end of the input */
add_last_line (err, source_str);
else
- /* otherwise just treat it as a error at a thin range */
+ /* otherwise just treat it as an error at a thin range */
add_lines_from_range (err, source_str, source_str + point, source_str + point + 1, NULL, NULL);
}
else
diff --git a/glib/gvariant.c b/glib/gvariant.c
index dd0e0470d..b61bf7278 100644
--- a/glib/gvariant.c
+++ b/glib/gvariant.c
@@ -426,7 +426,7 @@ NUMERIC_TYPE (BYTE, byte, guint8)
**/
/**
* g_variant_get_int16:
- * @value: a int16 #GVariant instance
+ * @value: an int16 #GVariant instance
*
* Returns the 16-bit signed integer value of @value.
*
@@ -476,7 +476,7 @@ NUMERIC_TYPE (UINT16, uint16, guint16)
**/
/**
* g_variant_get_int32:
- * @value: a int32 #GVariant instance
+ * @value: an int32 #GVariant instance
*
* Returns the 32-bit signed integer value of @value.
*
@@ -526,7 +526,7 @@ NUMERIC_TYPE (UINT32, uint32, guint32)
**/
/**
* g_variant_get_int64:
- * @value: a int64 #GVariant instance
+ * @value: an int64 #GVariant instance
*
* Returns the 64-bit signed integer value of @value.
*
diff --git a/glib/gvarianttypeinfo.c b/glib/gvarianttypeinfo.c
index 2904686b8..087294a09 100644
--- a/glib/gvarianttypeinfo.c
+++ b/glib/gvarianttypeinfo.c
@@ -546,7 +546,7 @@ tuple_align (gsize offset,
*
* Imagine we want to find the start of the "i" in the type "(su(qx)ni)".
* That's a string followed by a uint32, then a tuple containing a
- * uint16 and a int64, then an int16, then our "i". In order to get to
+ * uint16 and an int64, then an int16, then our "i". In order to get to
* our "i" we:
*
* Start at the end of the string, align to 4 (for the uint32), add 4.
@@ -660,7 +660,7 @@ tuple_set_base_info (TupleInfo *info)
{
/* the empty tuple: '()'.
*
- * has a size of 1 and an no alignment requirement.
+ * has a size of 1 and a no alignment requirement.
*
* It has a size of 1 (not 0) for two practical reasons:
*
diff --git a/glib/tests/option-context.c b/glib/tests/option-context.c
index 34ebfaaf6..d9a7c713a 100644
--- a/glib/tests/option-context.c
+++ b/glib/tests/option-context.c
@@ -1186,7 +1186,7 @@ callback_returns_false (void)
g_strfreev (argv_copy);
g_free (argv);
- /* And again, this time with a optional arg variant, with argument */
+ /* And again, this time with an optional arg variant, with argument */
context = g_option_context_new (NULL);
g_option_context_add_main_entries (context, entries, NULL);
@@ -1203,7 +1203,7 @@ callback_returns_false (void)
g_strfreev (argv_copy);
g_free (argv);
- /* And again, this time with a optional arg variant, without argument */
+ /* And again, this time with an optional arg variant, without argument */
context = g_option_context_new (NULL);
g_option_context_add_main_entries (context, entries, NULL);
diff --git a/gobject/gatomicarray.c b/gobject/gatomicarray.c
index 57b9ec228..5ebf6b89b 100644
--- a/gobject/gatomicarray.c
+++ b/gobject/gatomicarray.c
@@ -23,7 +23,7 @@
/* A GAtomicArray is a growable, mutable array of data
* generally of the form of a header of a specific size and
- * then a array of items of a fixed size.
+ * then an array of items of a fixed size.
*
* It is possible to do lock-less read transactions from the
* array without any protection against other reads or writes,
diff --git a/gobject/gmarshal.c b/gobject/gmarshal.c
index b979a438e..0c729b4b9 100644
--- a/gobject/gmarshal.c
+++ b/gobject/gmarshal.c
@@ -2040,7 +2040,7 @@ g_cclosure_marshal_VOID__VARIANTv (GClosure *closure,
* marshaller, see g_closure_set_marshal() and
* g_closure_set_meta_marshal()
*
- * A #GClosureMarshal function for use with signals with a unsigned int
+ * A #GClosureMarshal function for use with signals with an unsigned int
* and a pointer as arguments.
*/
/* VOID:UINT,POINTER */
diff --git a/gobject/gobject.c b/gobject/gobject.c
index ce42d10e2..df27c36f7 100644
--- a/gobject/gobject.c
+++ b/gobject/gobject.c
@@ -2655,7 +2655,7 @@ g_object_get_property (GObject *object,
*
* The signal specs expected by this function have the form
* "modifier::signal_name", where modifier can be one of the following:
- * * - signal: equivalent to g_signal_connect_data (..., NULL, 0)
+ * - signal: equivalent to g_signal_connect_data (..., NULL, 0)
* - object-signal, object_signal: equivalent to g_signal_connect_object (..., 0)
* - swapped-signal, swapped_signal: equivalent to g_signal_connect_data (..., NULL, G_CONNECT_SWAPPED)
* - swapped_object_signal, swapped-object-signal: equivalent to g_signal_connect_object (...,
G_CONNECT_SWAPPED)
diff --git a/gobject/gtype.c b/gobject/gtype.c
index 425c6195d..7d3789400 100644
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -3270,7 +3270,7 @@ g_type_default_interface_peek (GType g_type)
/**
* g_type_default_interface_unref:
* @g_iface: (type GObject.TypeInterface): the default vtable
- * structure for a interface, as returned by g_type_default_interface_ref()
+ * structure for an interface, as returned by g_type_default_interface_ref()
*
* Decrements the reference count for the type corresponding to the
* interface default vtable @g_iface. If the type is dynamic, then
@@ -4782,7 +4782,7 @@ g_type_class_get_instance_private_offset (gpointer g_class)
/**
* g_type_add_class_private:
- * @class_type: GType of an classed type
+ * @class_type: GType of a classed type
* @private_size: size of private structure
*
* Registers a private class structure for a classed type;
diff --git a/gobject/gvalue.c b/gobject/gvalue.c
index b7a944f4c..6d10f61a2 100644
--- a/gobject/gvalue.c
+++ b/gobject/gvalue.c
@@ -44,7 +44,7 @@
* of a type identifier and a specific value of that type.
* The type identifier within a #GValue structure always determines the
* type of the associated value.
- * To create a undefined #GValue structure, simply create a zero-filled
+ * To create an undefined #GValue structure, simply create a zero-filled
* #GValue structure. To initialize the #GValue, use the g_value_init()
* function. A #GValue cannot be used until it is initialized.
* The basic type operations (such as freeing and copying) are determined
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
