Merge branch 'typos' into 'main'

docs: Fix typos

See merge request GNOME/glib!4769

docs/toolchain-requirements.md

@@ -19,7 +19,7 @@ In general, we are primarily interested in supporting these four compilers:
  * MSVC
  * mingw32-w64
 
-This is in keeping with our goal of primarily targetting GNU/Linux, Windows and
+This is in keeping with our goal of primarily targeting GNU/Linux, Windows and
 Mac OS, along with Free Software POSIX-compliant operating systems.  See
 [Supported platforms](./supported-platforms.md) for a bit more information and
 rationale about that.

gio/gdbusconnection.c

@@ -2866,7 +2866,7 @@ initable_init (GInitable     *initable,
   /* Because of init_lock, we can't get here twice in different threads */
   g_assert (connection->initialization_error == NULL);
 
-  /* The user can pass multiple (but mutally exclusive) construct
+  /* The user can pass multiple (but mutually exclusive) construct
    * properties:
    *
    *  - stream (of type GIOStream)

gio/gdbusmessage.c

@@ -3932,7 +3932,7 @@ g_dbus_message_print (GDBusMessage *message,
  * @message: A #GDBusMessage.
  *
  * Checks whether @message is locked. To monitor changes to this
- * value, conncet to the #GObject::notify signal to listen for changes
+ * value, connect to the #GObject::notify signal to listen for changes
  * on the #GDBusMessage:locked property.
  *
  * Returns: %TRUE if @message is locked, %FALSE otherwise.

gio/gdbusobjectmanagerclient.c

@@ -1685,7 +1685,7 @@ remove_interfaces (GDBusObjectManagerClient   *manager,
 
   num_interfaces_to_remove = g_strv_length ((gchar **) interface_names);
 
-  /* see if we are going to completety remove the object */
+  /* see if we are going to completely remove the object */
   g_object_ref (manager);
   if (num_interfaces_to_remove == num_interfaces)
     {

gio/glocalfileinfo.c

@@ -900,7 +900,7 @@ get_access_rights (GFileAttributeMatcher *attribute_matcher,
 		   GLocalFileStat        *statbuf,
 		   GLocalParentFileInfo  *parent_info)
 {
-  /* FIXME: Windows: The underlyin _waccess() is mostly pointless */
+  /* FIXME: Windows: The underlying _waccess() is mostly pointless */
   if (_g_file_attribute_matcher_matches_id (attribute_matcher,
 					    G_FILE_ATTRIBUTE_ID_ACCESS_CAN_READ))
     _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_ACCESS_CAN_READ,

gio/gmemorymonitorpsi.c

@@ -294,7 +294,7 @@ g_memory_monitor_psi_calculate_mem_pressure_path (GMemoryMonitorPsi  *monitor,
       return FALSE;
     }
 
-  /* cgroupv2 is only supportted and the format is shown as follows:
+  /* cgroupv2 is only supported and the format is shown as follows:
    * ex: 0::/user.slice/user-0.slice/session-c3.scope */
   if (!g_str_has_prefix (path_read, "0::"))
     {

gio/gosxappinfo.m

@@ -338,7 +338,7 @@ get_bundle_for_id (CFStringRef bundle_id)
           g_free (id_str);
         }
       else
-        g_debug ("Application not found for unconvertable bundle id.");
+        g_debug ("Application not found for unconvertible bundle id.");
 #endif
       return NULL;
     }

gio/gsettingsbackend.c

@@ -403,7 +403,7 @@ g_settings_backend_changed (GSettingsBackend *backend,
  * end with '/' and must not contain '//').
  *
  * The meaning of this signal is that any of the key names resulting
- * from the contatenation of @path with each item in @items may have
+ * from the concatenation of @path with each item in @items may have
  * changed.
  *
  * The same rules for when notifications must occur apply as per

gio/gwin32appinfo.c

@@ -4398,7 +4398,7 @@ expand_macro (char               macro,
 Legend: (from http://msdn.microsoft.com/en-us/library/windows/desktop/cc144101%28v=vs.85%29.aspx)
 %* - replace with all parameters
 %~ - replace with all parameters starting with and following the second parameter
-%0 or %1 the first file parameter. For example "C:\\Users\\Eric\\Destop\\New Text Document.txt". Generally this should be in quotes and the applications command line parsing should accept quotes to disambiguate files with spaces in the name and different command line parameters (this is a security best practice and I believe mentioned in MSDN).
+%0 or %1 the first file parameter. For example "C:\\Users\\Eric\\Desktop\\New Text Document.txt". Generally this should be in quotes and the applications command line parsing should accept quotes to disambiguate files with spaces in the name and different command line parameters (this is a security best practice and I believe mentioned in MSDN).
 %<n> (where N is 2 - 9), replace with the nth parameter
 %s - show command
 %h - hotkey value
@@ -4975,7 +4975,7 @@ g_win32_app_info_launch_uwp_single (IApplicationActivationManager  *app_activati
        * ApplicationActivationManager methods return a process ID, but it
        * keeps no open HANDLE to the spawned process internally (tested
        * on Windows 10 21H2). So we cannot guarantee that by the time
-       * OpenProcess is called, process ID still referes to the spawned
+       * OpenProcess is called, process ID still refers to the spawned
        * process. Anyway hitting such case is extremely unlikely.
        *
        * https://docs.microsoft.com/en-us/answers/questions/942879/

gio/kqueue/dep-list.c

@@ -227,7 +227,7 @@ error:
  * Perform a diff on lists.
  *
  * This function performs something like a set intersection. The same items
- * will be removed from the both lists. Items are comapred by a filename.
+ * will be removed from the both lists. Items are compared by a filename.
  * 
  * @param[in,out] before A pointer to a pointer to a list. Will contain items
  *     which were not found in the 'after' list.

gio/tests/cancellable.c

@@ -1078,7 +1078,7 @@ cancelled_toggle_reference_cb (gpointer data,
                          "*has no handler with id*");
 
   /* We try resetting the a signal that isn't connected, since we don't care
-   * about anything but checking wether this would deadlock
+   * about anything but checking whether this would deadlock
    */
   g_cancellable_disconnect (cancellable, G_MAXULONG);
 
@@ -1142,7 +1142,7 @@ connect_data_destroy (gpointer user_data)
   g_assert_true (g_cancellable_is_cancelled (cancellable));
 
   /* We try resetting the cancellable, since we don't care
-   * about anything but checking wether this would deadlock
+   * about anything but checking whether this would deadlock
    */
   g_cancellable_reset (cancellable);
   g_object_unref (cancellable);

gio/tests/gsettings.c

@@ -805,7 +805,7 @@ test_l10n (void)
   new_locale = newlocale (LC_MESSAGES_MASK, "de_DE.UTF-8", (locale_t) 0);
   if (new_locale == (locale_t) 0)
     {
-      g_test_skip ("Cannot run test becaues de_DE.UTF-8 locale is not available");
+      g_test_skip ("Cannot run test because de_DE.UTF-8 locale is not available");
       g_object_unref (settings);
       return;
     }
@@ -878,7 +878,7 @@ test_l10n_context (void)
   new_locale = newlocale (LC_MESSAGES_MASK, "de_DE.UTF-8", (locale_t) 0);
   if (new_locale == (locale_t) 0)
     {
-      g_test_skip ("Cannot run test becaues de_DE.UTF-8 locale is not available");
+      g_test_skip ("Cannot run test because de_DE.UTF-8 locale is not available");
       g_object_unref (settings);
       return;
     }
@@ -944,7 +944,7 @@ test_l10n_time (void)
   new_locale = newlocale (LC_TIME_MASK, "de_DE.UTF-8", new_locale);
   if (new_locale == (locale_t) 0)
     {
-      g_test_skip ("Cannot run test becaues de_DE.UTF-8 locale is not available");
+      g_test_skip ("Cannot run test because de_DE.UTF-8 locale is not available");
       g_object_unref (settings);
       return;
     }

gio/tests/gtlsconsoleinteraction.c

@@ -73,7 +73,7 @@ static_getpass (const gchar *prompt)
 }
 #undef getpass
 #define getpass static_getpass /* avoid overloading a potential
-                                  build environment defintion of getpass */
+                                  build environment definition of getpass */
 #endif
 
 static GTlsInteractionResult

gio/tests/memory-settings-backend.c

@@ -25,7 +25,7 @@
 #include <gio/gsettingsbackend.h>
 
 /* Test that the "gsettings-backend" extension point has been registered.
- * Must be run first and separetly from other GSettingsBackend,
+ * Must be run first and separately from other GSettingsBackend,
  * as they will register the extension point making the test useless.
  */
 static void

gio/tests/null-settings-backend.c

@@ -24,7 +24,7 @@
 #include <gio/gsettingsbackend.h>
 
 /* Test that the "gsettings-backend" extension point has been registered.
- * Must be run first and separetly from other GSettingsBackend,
+ * Must be run first and separately from other GSettingsBackend,
  * as they will register the extension point making the test useless.
  */
 static void

gio/tests/osx-appinfo.c

@@ -53,7 +53,7 @@ test_launch_async (GList *uris)
   while (result == NULL)
     g_main_context_iteration (NULL, TRUE);
 
-  // Locally, the result is TRUE, but in CI it's FALSE, due to the absense of a GUI(?)
+  // Locally, the result is TRUE, but in CI it's FALSE, due to the absence of a GUI(?)
   if (g_app_info_launch_uris_finish (G_APP_INFO (app_info), result, &error))
     g_assert_no_error (error);
   else

gio/tests/trash.c

@@ -99,7 +99,7 @@ test_trash_not_supported (void)
   g_object_unref (file);
 }
 
-/* Test that symlinks are properly expaned when looking for topdir (e.g. for trash folder). */
+/* Test that symlinks are properly expanded when looking for topdir (e.g. for trash folder). */
 static void
 test_trash_symlinks (void)
 {

girepository/gitypelib-internal.h

@@ -519,7 +519,7 @@ typedef struct {
  * @caller_owns_return_value: If set, the caller is responsible for freeing
  *   the return value if it is no longer needed.
  * @caller_owns_return_container: This flag is only relevant if the return type
- *   is a container type. If the flag is set, the caller is resonsible for
+ *   is a container type. If the flag is set, the caller is responsible for
  *   freeing the container, but not its contents.
  * @skip_return: Indicates that the return value is only useful in C and should
  *   be skipped.
@@ -1020,7 +1020,7 @@ typedef struct {
  *   things.
  * @setter: the index of the setter function for this property, if @writable
  *   is set; if the method is not known, the value will be set to %ACCESSOR_SENTINEL
- * @getter: ths index of the getter function for this property, if @readable
+ * @getter: the index of the getter function for this property, if @readable
  *   is set; if the method is not known, the value will be set to %ACCESSOR_SENTINEL
  * @reserved: Reserved for future use.
  * @reserved2: Reserved for future use.

girepository/gitypelib.c

@@ -727,7 +727,7 @@ validate_param_type_blob (GITypelib     *typelib,
       g_set_error (error,
                    GI_TYPELIB_ERROR,
                    GI_TYPELIB_ERROR_INVALID_BLOB,
-                   "Pointer type exected for tag %d", blob->tag);
+                   "Pointer type expected for tag %d", blob->tag);
       return FALSE;
     }
 
@@ -768,7 +768,7 @@ validate_error_type_blob (GITypelib     *typelib,
       g_set_error (error,
                    GI_TYPELIB_ERROR,
                    GI_TYPELIB_ERROR_INVALID_BLOB,
-                   "Pointer type exected for tag %d", blob->tag);
+                   "Pointer type expected for tag %d", blob->tag);
       return FALSE;
     }
 
@@ -806,7 +806,7 @@ validate_type_blob (GITypelib     *typelib,
           g_set_error (error,
                        GI_TYPELIB_ERROR,
                        GI_TYPELIB_ERROR_INVALID_BLOB,
-                       "Pointer type exected for tag %d", simple->flags.tag);
+                       "Pointer type expected for tag %d", simple->flags.tag);
           return FALSE;
         }
 

glib/gconvert.c

@@ -809,7 +809,7 @@ typedef enum
 
 /*
  * Convert from @string in the encoding identified by @from_codeset,
- * returning a string in the encoding identifed by @to_codeset.
+ * returning a string in the encoding identified by @to_codeset.
  * @len can be negative if @string is nul-terminated, or a non-negative
  * value in bytes. Flags defined in #ConvertCheckFlags can be set in @flags
  * to check the input, the output, or both, for embedded nul bytes.

glib/gdataset.c

@@ -169,7 +169,7 @@ g_datalist_unlock_and_set (GData **datalist, gpointer ptr)
 static gsize
 datalist_alloc_size (guint32 alloc)
 {
-  /* GDataElt also contains pointer. It thus is suitable aligned for pointers,
+  /* GDataElt also contains pointer. It thus is suitably aligned for pointers,
    * and we can just append the pointer for the index at the end. */
   return G_STRUCT_OFFSET (GData, data) +
          (((gsize) alloc) * sizeof (GDataElt)) +
@@ -411,7 +411,7 @@ datalist_shrink (GData **data, GData **d_to_free)
   if (v != alloc_by_4)
     {
       /* d->alloc is a power of two (unless it's G_MAXUINT32). Usually, we
-       * remove one element at a time, then we will just reach reach a quarter
+       * remove one element at a time, then we will just reach a quarter
        * of that.
        *
        * However, with g_datalist_id_remove_multiple(), len can be smaller

glib/gfileutils.c

@@ -2026,7 +2026,7 @@ g_build_path_va (const gchar  *separator,
 
 /**
  * g_build_pathv:
- * @separator: a string used to separator the elements of the path.
+ * @separator: a string used to separate the elements of the path.
  * @args: (array zero-terminated=1) (element-type filename): %NULL-terminated
  *   array of strings containing the path elements.
  * 
@@ -2053,7 +2053,7 @@ g_build_pathv (const gchar  *separator,
 
 /**
  * g_build_path:
- * @separator: (type filename): a string used to separator the elements of the path.
+ * @separator: (type filename): a string used to separate the elements of the path.
  * @first_element: (type filename): the first element in the path
  * @...: remaining elements in path, terminated by %NULL
  * 

glib/ghash.c

@@ -1909,7 +1909,7 @@ g_hash_table_steal_all (GHashTable *hash_table)
  * destroy function.
  *
  * Returns: (transfer container): a #GPtrArray containing each key of
- * the table. Unref with with g_ptr_array_unref() when done.
+ * the table. Unref with g_ptr_array_unref() when done.
  *
  * Since: 2.76
  */
@@ -1946,7 +1946,7 @@ g_hash_table_steal_all_keys (GHashTable *hash_table)
  * destroy function.
  *
  * Returns: (transfer container): a #GPtrArray containing each value of
- * the table. Unref with with g_ptr_array_unref() when done.
+ * the table. Unref with g_ptr_array_unref() when done.
  *
  * Since: 2.76
  */
@@ -2318,7 +2318,7 @@ g_hash_table_get_keys_as_array (GHashTable *hash_table,
  * You should always unref the returned array with g_ptr_array_unref().
  *
  * Returns: (transfer container): a #GPtrArray containing each key from
- * the table. Unref with with g_ptr_array_unref() when done.
+ * the table. Unref with g_ptr_array_unref() when done.
  *
  * Since: 2.76
  **/
@@ -2393,7 +2393,7 @@ g_hash_table_get_values (GHashTable *hash_table)
  * You should always unref the returned array with g_ptr_array_unref().
  *
  * Returns: (transfer container): a #GPtrArray containing each value from
- * the table. Unref with with g_ptr_array_unref() when done.
+ * the table. Unref with g_ptr_array_unref() when done.
  *
  * Since: 2.76
  **/

glib/gpathbuf.c

@@ -560,7 +560,7 @@ g_path_buf_to_path (GPathBuf *buf)
  * Compares two path buffers for equality and returns `TRUE`
  * if they are equal.
  *
- * The path inside the paths buffers are not going to be normalized,
+ * The paths inside the path buffers are not going to be normalized,
  * so `X/Y/Z/A/..`, `X/./Y/Z` and `X/Y/Z` are not going to be considered
  * equal.
  *

glib/gstrfuncs.c

@@ -1022,7 +1022,7 @@ g_parse_long_long (const gchar  *nptr,
                    guint         base,
                    gboolean     *negative)
 {
-  /* this code is based on on the strtol(3) code from GNU libc released under
+  /* this code is based on the strtol(3) code from GNU libc released under
    * the GNU Lesser General Public License.
    *
    * Copyright (C) 1991,92,94,95,96,97,98,99,2000,01,02

glib/gstring.c

@@ -154,7 +154,7 @@ g_string_new (const gchar *init)
  * Creates a new #GString, initialized with the given string.
  *
  * After this call, @init belongs to the #GString and may no longer be
- * modified by the caller. The memory of @data has to be dynamically
+ * modified by the caller. The memory of @init has to be dynamically
  * allocated and will eventually be freed with g_free().
  *
  * Returns: (transfer full): the new #GString

glib/gtestutils.c

@@ -2874,7 +2874,7 @@ g_test_add_data_func (const char     *testpath,
  *
  * Creates a new test case.
  *
- * In constract to [func@GLib.test_add_data_func], this function
+ * In contrast to [func@GLib.test_add_data_func], this function
  * is freeing @test_data after the test run is complete.
  *
  * Since: 2.34

glib/gunicode.h

@@ -864,7 +864,7 @@ gchar   *g_utf8_truncate_middle   (const gchar *string,
                                    gsize        truncate_length);
 
 /* Find the UTF-8 character corresponding to ch, in string p. These
-   functions are equivalants to strchr and strrchr */
+   functions are equivalents to strchr and strrchr */
 GLIB_AVAILABLE_IN_ALL
 gchar* g_utf8_strchr  (const gchar *p,
                        gssize       len,

glib/gunicollate.c

@@ -229,7 +229,7 @@ collate_key_to_string (UCCollationValue *key,
    *
    * UCCollateOptions (32/64 bits)
    * SizeInBytes      (32/64 bits)
-   * Value            (8 bits arrey)
+   * Value            (8 bits array)
    *
    * UCCollateOptions: ordering option mask of the collator
    * used to create the key. Size changes on 32-bit / 64-bit

glib/gvariant-serialiser.c

@@ -1620,7 +1620,7 @@ g_variant_serialised_get_child (GVariantSerialised serialised,
  * memory region large enough to serialize into (ie: at least as big as
  * the size field).
  *
- * This function is only resonsible for serializing the top-level
+ * This function is only responsible for serializing the top-level
  * container.  @gvs_filler is called on each child of the container in
  * order for all of the data of that child to be filled in.
  */

glib/tests/fileutils.c

@@ -2642,7 +2642,7 @@ test_clear_fd_ebadf (void)
   gboolean ret;
   GWin32InvalidParameterHandler handler;
 
-  /* We're going to trigger a programming error: attmpting to close a
+  /* We're going to trigger a programming error: attempting to close a
    * fd that was already closed. Make criticals non-fatal. */
   g_assert_true (g_test_undefined ());
   g_log_set_always_fatal (G_LOG_FATAL_MASK);

glib/tests/gvariant.c

@@ -5722,7 +5722,7 @@ test_normal_checking_tuple_offsets5 (void)
    *  - The offset of the first `s` in the tuple is always 0.
    *
    * See §2.5.4 (Structures) of the GVariant specification for details, noting
-   * that the table is only layed out this way because all three members of the
+   * that the table is only laid out this way because all three members of the
    * tuple have non-fixed sizes.
    *
    * It’s not clear whether the 0xaa data of this variant is part of the strings

glib/tests/mem-overflow.c

@@ -1,4 +1,4 @@
-/* Unit tests for g
+/* Unit tests for gmem
  * Copyright (C) 2010 Red Hat, Inc.
  *
  * SPDX-License-Identifier: LicenseRef-old-glib-tests

glib/tests/messages-low-memory.c

@@ -78,7 +78,7 @@ main (int   argc,
 #ifndef __linux__
   if (!our_malloc_called)
     {
-      /* For some reasons this doesn't work darwin systems, so ignore the result
+      /* For some reasons this doesn't work on darwin systems, so ignore the result
        * for non-linux, while we want to ensure the test is valid at least there
        */
       g_message ("Our malloc implementation has not been called, the test "

glib/tests/unicode.c

@@ -1697,7 +1697,7 @@ test_canonical_decomposition (void)
 #undef TEST_DECOMP
 }
 
-/* Test that g_unichar_decompose() whenever encouttering a char ch
+/* Test that g_unichar_decompose() whenever encountering a char ch
  * decomposes into a and b, b itself won't decompose any further. */
 static void
 test_decompose_tail (void)

glib/tests/utf8.txt

@@ -4,7 +4,7 @@
 #    
 # Which was created by   Markus Kuhn <mkuhn@acm.org> - 2000-09-02 
 #
-# lines begining with # and blank lines are ignored
+# lines beginning with # and blank lines are ignored
 #
 # Beyond that, this file consists of a series of test cases. Each test case consists of
 # 2 or 3 lines:

gobject/glib-types.h

@@ -28,7 +28,7 @@
 
 G_BEGIN_DECLS
 
-/* A hack necesssary to preprocess this file with g-ir-scanner */
+/* A hack necessary to preprocess this file with g-ir-scanner */
 #ifdef __GI_SCANNER__
 typedef gsize GType;
 #endif

gobject/gparam.c

@@ -1191,7 +1191,7 @@ g_param_spec_pool_lookup (GParamSpecPool *pool,
           type = g_type_from_name (buffer);
           if (l >= 32)
             g_free (buffer);
-          if (type)         /* type==0 isn't a valid type pefix */
+          if (type)         /* type==0 isn't a valid type prefix */
             {
               /* sanity check, these cases don't make a whole lot of sense */
               if ((!walk_ancestors && type != owner_type) || !g_type_is_a (owner_type, type))

gobject/gparam.h

@@ -411,7 +411,7 @@ GType	g_param_type_register_static	(const gchar		  *name,
 GOBJECT_AVAILABLE_IN_2_66
 gboolean g_param_spec_is_valid_name    (const gchar              *name);
 
-/* For registering builting types */
+/* For registering builtin types */
 GType  _g_param_type_register_static_constant (const gchar              *name,
 					       const GParamSpecTypeInfo *pspec_info,
 					       GType                     opt_type);

meson.build

@@ -2301,7 +2301,7 @@ endif
 
 # First check in libc, fallback to libintl, and as last chance build
 # proxy-libintl subproject.
-# FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
+# FIXME: glib-gettext.m4 has much more checks to detect broken/incompatible
 # implementations. This could be extended if issues are found in some platforms.
 libintl_deps = []
 libintl_prefix = '#include <libintl.h>'