From 1b28408b8bfe282f671716a39bba3208d3fef39a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 29 Aug 2011 14:49:32 -0400 Subject: [PATCH] Spelling fixes Spelling fixes in comments and docs, provided by Kjartan Maraas in bug 657336. --- gio/gapplicationcommandline.c | 2 +- gio/gasyncinitable.c | 2 +- gio/gbufferedinputstream.c | 4 ++-- gio/gcancellable.c | 2 +- gio/gconverter.c | 4 ++-- gio/gdatainputstream.c | 2 +- gio/gdbusconnection.c | 6 +++--- gio/gdbusserver.c | 2 +- gio/gdesktopappinfo.c | 2 +- gio/gdrive.c | 2 +- gio/gfile.c | 4 ++-- gio/gfileattribute.c | 2 +- gio/gfileenumerator.c | 8 ++++---- gio/gfileinputstream.c | 4 ++-- gio/gfilemonitor.c | 4 ++-- gio/ginitable.c | 8 ++++---- gio/ginputstream.c | 16 ++++++++-------- gio/giomodule.h | 2 +- gio/giostream.c | 12 ++++++------ gio/giotypes.h | 2 +- gio/gloadableicon.c | 4 ++-- gio/glocalfile.c | 2 +- gio/gmount.c | 16 ++++++++-------- gio/goutputstream.c | 22 +++++++++++----------- gio/gproxyaddressenumerator.c | 2 +- gio/gregistrysettingsbackend.c | 4 ++-- gio/gseekable.c | 4 ++-- gio/gsettings.c | 6 +++--- gio/gsettingsbackend.c | 4 ++-- gio/gsimplepermission.c | 2 +- gio/gsocket.c | 2 +- gio/gsocketaddress.c | 2 +- gio/gsocks5proxy.c | 4 ++-- gio/gunionvolumemonitor.c | 2 +- gio/gvolume.c | 6 +++--- gio/gwin32mount.c | 2 +- gio/strinfo.c | 4 ++-- glib/gbsearcharray.h | 2 +- glib/gconvert.c | 18 +++++++++--------- glib/gdataset.c | 2 +- glib/gdatetime.c | 10 +++++----- glib/gfileutils.c | 2 +- glib/gmain.c | 2 +- glib/gregex.c | 16 ++++++++-------- glib/gregex.h | 2 +- glib/gslice.c | 6 +++--- glib/gstdio.h | 2 +- glib/gstrfuncs.c | 2 +- glib/gthread.c | 6 +++--- glib/gthreadpool.c | 4 ++-- glib/gthreadprivate.h | 2 +- glib/gtimezone.c | 2 +- glib/gutf8.c | 12 ++++++------ glib/gutils.c | 2 +- glib/gvariant-parser.c | 2 +- glib/gvariant-serialiser.c | 4 ++-- glib/gvariant.c | 2 +- glib/gvarianttypeinfo.c | 2 +- glib/gvarianttypeinfo.h | 6 +++--- glib/gwin32.c | 2 +- gmodule/gmodule.c | 2 +- gmodule/gmodule.h | 2 +- gobject/gboxed.c | 4 ++-- gobject/gclosure.c | 4 ++-- gobject/glib-genmarshal.c | 2 +- gobject/gobject.c | 2 +- gobject/gobject.h | 6 +++--- gobject/gparam.c | 4 ++-- gobject/gparam.h | 2 +- gobject/gsignal.c | 4 ++-- gobject/gtype.c | 4 ++-- gobject/gvaluearray.c | 4 ++-- tests/memchunks.c | 2 +- tests/threadpool-test.c | 4 ++-- 74 files changed, 167 insertions(+), 167 deletions(-) diff --git a/gio/gapplicationcommandline.c b/gio/gapplicationcommandline.c index 8d2fbc3..e7a5c6c 100644 --- a/gio/gapplicationcommandline.c +++ b/gio/gapplicationcommandline.c @@ -575,7 +575,7 @@ g_application_command_line_get_exit_status (GApplicationCommandLine *cmdline) * Gets the platform data associated with the invocation of @cmdline. * * This is a #GVariant dictionary containing information about the - * context in which the invocation occured. It typically contains + * context in which the invocation occurred. It typically contains * information like the current working directory and the startup * notification ID. * diff --git a/gio/gasyncinitable.c b/gio/gasyncinitable.c index 20e59ac..471763e 100644 --- a/gio/gasyncinitable.c +++ b/gio/gasyncinitable.c @@ -225,7 +225,7 @@ g_async_initable_init_async (GAsyncInitable *initable, * g_async_initable_init_finish: * @initable: a #GAsyncInitable. * @res: a #GAsyncResult. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Finishes asynchronous initialization and returns the result. diff --git a/gio/gbufferedinputstream.c b/gio/gbufferedinputstream.c index 711c8d3..86dc2ca 100644 --- a/gio/gbufferedinputstream.c +++ b/gio/gbufferedinputstream.c @@ -361,7 +361,7 @@ g_buffered_input_stream_new_sized (GInputStream *base_stream, * @stream: a #GBufferedInputStream * @count: the number of bytes that will be read from the stream * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * * Tries to read @count bytes from the stream into the buffer. * Will block during this read. @@ -841,7 +841,7 @@ g_buffered_input_stream_read (GInputStream *stream, * g_buffered_input_stream_read_byte: * @stream: a #GBufferedInputStream * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * * Tries to read a single byte from the stream or the buffer. Will block * during this read. diff --git a/gio/gcancellable.c b/gio/gcancellable.c index ba7911b..6524934 100644 --- a/gio/gcancellable.c +++ b/gio/gcancellable.c @@ -186,7 +186,7 @@ g_cancellable_new (void) * @cancellable: a #GCancellable object * * Pushes @cancellable onto the cancellable stack. The current - * cancellable can then be recieved using g_cancellable_get_current(). + * cancellable can then be received using g_cancellable_get_current(). * * This is useful when implementing cancellable operations in * code that does not allow you to pass down the cancellable object. diff --git a/gio/gconverter.c b/gio/gconverter.c index 8104d89..3e47b1f 100644 --- a/gio/gconverter.c +++ b/gio/gconverter.c @@ -62,7 +62,7 @@ g_converter_default_init (GConverterInterface *iface) * @flags: a #GConvertFlags controlling the conversion details * @bytes_read: (out): will be set to the number of bytes read from @inbuf on success * @bytes_written: (out): will be set to the number of bytes written to @outbuf on success - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * * This is the main operation used when converting data. It is to be called * multiple times in a loop, and each time it will do some work, i.e. @@ -126,7 +126,7 @@ g_converter_default_init (GConverterInterface *iface) * If the flag %G_CONVERTER_FLUSH is set then conversion is modified * to try to write out all internal state to the output. The application * has to call the function multiple times with the flag set, and when - * the availible input has been consumed and all internal state has + * the available input has been consumed and all internal state has * been produced then %G_CONVERTER_FLUSHED (or %G_CONVERTER_FINISHED if * really at the end) is returned instead of %G_CONVERTER_CONVERTED. * This is somewhat similar to what happens at the end of the input stream, diff --git a/gio/gdatainputstream.c b/gio/gdatainputstream.c index 5c9184c..d5dd2fd 100644 --- a/gio/gdatainputstream.c +++ b/gio/gdatainputstream.c @@ -251,7 +251,7 @@ g_data_input_stream_get_byte_order (GDataInputStream *stream) * * Note that using G_DATA_STREAM_NEWLINE_TYPE_ANY is slightly unsafe. If a read * chunk ends in "CR" we must read an additional byte to know if this is "CR" or - * "CR LF", and this might block if there is no more data availible. + * "CR LF", and this might block if there is no more data available. * **/ void diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c index 098b915..643c0e4 100644 --- a/gio/gdbusconnection.c +++ b/gio/gdbusconnection.c @@ -57,7 +57,7 @@ * - probably want a G_DBUS_NONCE_TCP_TMPDIR environment variable * to specify where the nonce is stored. This will allow people to use * G_DBUS_NONCE_TCP_TMPDIR=/mnt/secure.company.server/dbus-nonce-dir - * to easily acheive secure RPC via nonce-tcp. + * to easily achieve secure RPC via nonce-tcp. * * - need to expose an extension point for resolving D-Bus address and * turning them into GIOStream objects. This will allow us to implement @@ -1873,7 +1873,7 @@ g_dbus_connection_send_message_with_reply (GDBusConnection *connection, * Finishes an operation started with g_dbus_connection_send_message_with_reply(). * * Note that @error is only set if a local in-process error - * occured. That is to say that the returned #GDBusMessage object may + * occurred. That is to say that the returned #GDBusMessage object may * be of type %G_DBUS_MESSAGE_TYPE_ERROR. Use * g_dbus_message_to_gerror() to transcode this to a #GError. * @@ -1968,7 +1968,7 @@ send_message_with_reply_sync_cb (GDBusConnection *connection, * the operation fails with %G_IO_ERROR_INVALID_ARGUMENT. * * Note that @error is only set if a local in-process error - * occured. That is to say that the returned #GDBusMessage object may + * occurred. That is to say that the returned #GDBusMessage object may * be of type %G_DBUS_MESSAGE_TYPE_ERROR. Use * g_dbus_message_to_gerror() to transcode this to a #GError. * diff --git a/gio/gdbusserver.c b/gio/gdbusserver.c index 472fc32..c1a098e 100644 --- a/gio/gdbusserver.c +++ b/gio/gdbusserver.c @@ -766,7 +766,7 @@ try_unix (GDBusServer *server, /* ---------------------------------------------------------------------------------------------------- */ /* note that address_entry has already been validated => - * both host and port (guranteed to be a number in [0, 65535]) are set (family is optional) + * both host and port (guaranteed to be a number in [0, 65535]) are set (family is optional) */ static gboolean try_tcp (GDBusServer *server, diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c index 996acdf..6bd6a0d 100644 --- a/gio/gdesktopappinfo.c +++ b/gio/gdesktopappinfo.c @@ -2087,7 +2087,7 @@ g_desktop_app_info_delete (GAppInfo *appinfo) * @commandline: the commandline to use * @application_name: (allow-none): the application name, or %NULL to use @commandline * @flags: flags that can specify details of the created #GAppInfo - * @error: a #GError location to store the error occuring, %NULL to ignore. + * @error: a #GError location to store the error occurring, %NULL to ignore. * * Creates a new #GAppInfo from the given information. * diff --git a/gio/gdrive.c b/gio/gdrive.c index b4a6164..2eff3ca 100644 --- a/gio/gdrive.c +++ b/gio/gdrive.c @@ -455,7 +455,7 @@ g_drive_eject_with_operation (GDrive *drive, * g_drive_eject_with_operation_finish: * @drive: a #GDrive. * @result: a #GAsyncResult. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Finishes ejecting a drive. If any errors occurred during the operation, diff --git a/gio/gfile.c b/gio/gfile.c index f317011..48a0652 100644 --- a/gio/gfile.c +++ b/gio/gfile.c @@ -727,7 +727,7 @@ g_file_get_child_for_display_name (GFile *file, * @prefix: input #GFile. * * Checks whether @file has the prefix specified by @prefix. In other word, - * if the names of inital elements of @files pathname match @prefix. + * if the names of initial elements of @files pathname match @prefix. * Only full pathname elements are matched, so a path like /foo is not * considered a prefix of /foobar, only of /foo/bar. * @@ -6100,7 +6100,7 @@ g_file_query_default_handler (GFile *file, content_type = g_file_info_get_content_type (info); if (content_type) { - /* Don't use is_native(), as we want to support fuse paths if availible */ + /* Don't use is_native(), as we want to support fuse paths if available */ path = g_file_get_path (file); appinfo = g_app_info_get_default_for_type (content_type, path == NULL); diff --git a/gio/gfileattribute.c b/gio/gfileattribute.c index a2849de..8e4b8bf 100644 --- a/gio/gfileattribute.c +++ b/gio/gfileattribute.c @@ -50,7 +50,7 @@ * %G_FILE_ATTRIBUTE_TYPE_INVALID. * * The list of possible attributes for a filesystem (pointed to by a #GFile) is - * availible as a #GFileAttributeInfoList. This list is queryable by key names + * available as a #GFileAttributeInfoList. This list is queryable by key names * as indicated earlier. * * Classes that implement #GFileIface will create a #GFileAttributeInfoList and diff --git a/gio/gfileenumerator.c b/gio/gfileenumerator.c index c33102b..ef9d56a 100644 --- a/gio/gfileenumerator.c +++ b/gio/gfileenumerator.c @@ -174,7 +174,7 @@ g_file_enumerator_init (GFileEnumerator *enumerator) * g_file_enumerator_next_file: * @enumerator: a #GFileEnumerator. * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * * Returns information for the next file in the enumerated object. * Will block until the information is available. The #GFileInfo @@ -239,7 +239,7 @@ g_file_enumerator_next_file (GFileEnumerator *enumerator, * g_file_enumerator_close: * @enumerator: a #GFileEnumerator. * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * * Releases all resources used by this enumerator, making the * enumerator return %G_IO_ERROR_CLOSED on all calls. @@ -385,7 +385,7 @@ g_file_enumerator_next_files_async (GFileEnumerator *enumerator, * g_file_enumerator_next_files_finish: * @enumerator: a #GFileEnumerator. * @result: a #GAsyncResult. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Finishes the asynchronous operation started with g_file_enumerator_next_files_async(). @@ -494,7 +494,7 @@ g_file_enumerator_close_async (GFileEnumerator *enumerator, * g_file_enumerator_close_finish: * @enumerator: a #GFileEnumerator. * @result: a #GAsyncResult. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Finishes closing a file enumerator, started from g_file_enumerator_close_async(). diff --git a/gio/gfileinputstream.c b/gio/gfileinputstream.c index 42942b4..36e143c 100644 --- a/gio/gfileinputstream.c +++ b/gio/gfileinputstream.c @@ -113,7 +113,7 @@ g_file_input_stream_init (GFileInputStream *stream) * @stream: a #GFileInputStream. * @attributes: a file attribute query string. * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Queries a file input stream the given @attributes. This function blocks @@ -234,7 +234,7 @@ g_file_input_stream_query_info_async (GFileInputStream *stream, * g_file_input_stream_query_info_finish: * @stream: a #GFileInputStream. * @result: a #GAsyncResult. - * @error: a #GError location to store the error occuring, + * @error: a #GError location to store the error occurring, * or %NULL to ignore. * * Finishes an asynchronous info query operation. diff --git a/gio/gfilemonitor.c b/gio/gfilemonitor.c index 6cd5ad6..e4d6589 100644 --- a/gio/gfilemonitor.c +++ b/gio/gfilemonitor.c @@ -511,7 +511,7 @@ calc_min_time (GFileMonitor *monitor, if (limiter->last_sent_change_time != 0) { - /* Set a timeout at 2*rate limit so that we can clear out the change from the hash eventualy */ + /* Set a timeout at 2*rate limit so that we can clear out the change from the hash eventually */ expire_at = limiter->last_sent_change_time + 2 * monitor->priv->rate_limit_msec; if (time_difference (time_now, expire_at) > 0) @@ -719,7 +719,7 @@ g_file_monitor_emit_event (GFileMonitor *monitor, limiter->last_sent_change_time = time_now; limiter->send_delayed_change_at = 0; - /* Set a timeout of 2*rate limit so that we can clear out the change from the hash eventualy */ + /* Set a timeout of 2*rate limit so that we can clear out the change from the hash eventually */ update_rate_limiter_timeout (monitor, time_now + 2 * monitor->priv->rate_limit_msec); } diff --git a/gio/ginitable.c b/gio/ginitable.c index 71da94e..b2df3a9 100644 --- a/gio/ginitable.c +++ b/gio/ginitable.c @@ -64,7 +64,7 @@ g_initable_default_init (GInitableInterface *iface) * g_initable_init: * @initable: a #GInitable. * @cancellable: optional #GCancellable object, %NULL to ignore. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Initializes the object implementing the interface. This must be @@ -110,7 +110,7 @@ g_initable_init (GInitable *initable, * g_initable_new: * @object_type: a #GType supporting #GInitable. * @cancellable: optional #GCancellable object, %NULL to ignore. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * @first_property_name: the name of the first property, or %NULL if no * properties @@ -150,7 +150,7 @@ g_initable_new (GType object_type, * @n_parameters: the number of parameters in @parameters * @parameters: the parameters to use to construct the object * @cancellable: optional #GCancellable object, %NULL to ignore. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Helper function for constructing #GInitiable object. This is @@ -190,7 +190,7 @@ g_initable_newv (GType object_type, * the value, and other property value pairs, and ended by %NULL. * @var_args: The var args list generated from @first_property_name. * @cancellable: optional #GCancellable object, %NULL to ignore. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Helper function for constructing #GInitiable object. This is diff --git a/gio/ginputstream.c b/gio/ginputstream.c index 53e84a0..e46f2df 100644 --- a/gio/ginputstream.c +++ b/gio/ginputstream.c @@ -140,7 +140,7 @@ g_input_stream_init (GInputStream *stream) * @buffer: a buffer to read data into (which should be at least count bytes long). * @count: the number of bytes that will be read from the stream * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * * Tries to read @count bytes from the stream into the buffer starting at * @buffer. Will block during this read. @@ -218,7 +218,7 @@ g_input_stream_read (GInputStream *stream, * @count: the number of bytes that will be read from the stream * @bytes_read: (out): location to store the number of bytes that was read from the stream * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * * Tries to read @count bytes from the stream into the buffer starting at * @buffer. Will block during this read. @@ -278,7 +278,7 @@ g_input_stream_read_all (GInputStream *stream, * @stream: a #GInputStream. * @count: the number of bytes that will be skipped from the stream * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * * Tries to skip @count bytes from the stream. Will block during the operation. * @@ -394,7 +394,7 @@ g_input_stream_real_skip (GInputStream *stream, * g_input_stream_close: * @stream: A #GInputStream. * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * * Closes the stream, releasing resources related to it. * @@ -578,7 +578,7 @@ g_input_stream_read_async (GInputStream *stream, * g_input_stream_read_finish: * @stream: a #GInputStream. * @result: a #GAsyncResult. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Finishes an asynchronous stream read operation. @@ -702,7 +702,7 @@ g_input_stream_skip_async (GInputStream *stream, * g_input_stream_skip_finish: * @stream: a #GInputStream. * @result: a #GAsyncResult. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Finishes a stream skip operation. @@ -800,7 +800,7 @@ g_input_stream_close_async (GInputStream *stream, * g_input_stream_close_finish: * @stream: a #GInputStream. * @result: a #GAsyncResult. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Finishes closing a stream asynchronously, started from g_input_stream_close_async(). @@ -868,7 +868,7 @@ g_input_stream_has_pending (GInputStream *stream) /** * g_input_stream_set_pending: * @stream: input stream - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Sets @stream to have actions pending. If the pending flag is diff --git a/gio/giomodule.h b/gio/giomodule.h index 5f04acb..100af54 100644 --- a/gio/giomodule.h +++ b/gio/giomodule.h @@ -115,7 +115,7 @@ void g_io_module_unload (GIOModule *module); * * This method will not be called in normal use, however it may be * called when probing existing modules and recording which extension - * points that this modle is used for. This means we won't have to + * points that this model is used for. This means we won't have to * load and initialze this module unless its needed. * * If this function is not implemented by the module the module will diff --git a/gio/giostream.c b/gio/giostream.c index db3cd92..b892c84 100644 --- a/gio/giostream.c +++ b/gio/giostream.c @@ -283,7 +283,7 @@ g_io_stream_has_pending (GIOStream *stream) /** * g_io_stream_set_pending: * @stream: a #GIOStream - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore * * Sets @stream to have actions pending. If the pending flag is @@ -362,7 +362,7 @@ g_io_stream_real_close (GIOStream *stream, * g_io_stream_close: * @stream: a #GIOStream * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * * Closes the stream, releasing resources related to it. This will also * closes the individual input and output streams, if they are not already @@ -515,7 +515,7 @@ g_io_stream_close_async (GIOStream *stream, * g_io_stream_close_finish: * @stream: a #GIOStream * @result: a #GAsyncResult - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore * * Closes a stream. @@ -661,7 +661,7 @@ splice_close_cb (GObject *iostream, ctx = g_simple_async_result_get_op_res_gpointer (simple); ctx->completed++; - /* Keep the first error that occured */ + /* Keep the first error that occurred */ if (error != NULL && ctx->error == NULL) ctx->error = error; else @@ -695,7 +695,7 @@ splice_cb (GObject *ostream, !g_cancellable_is_cancelled (ctx->cancellable))) g_clear_error (&error); - /* Keep the first error that occured */ + /* Keep the first error that occurred */ if (error != NULL && ctx->error == NULL) ctx->error = error; else @@ -831,7 +831,7 @@ g_io_stream_splice_async (GIOStream *stream1, /** * g_io_stream_splice_finish: * @result: a #GAsyncResult. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Finishes an asynchronous io stream splice operation. diff --git a/gio/giotypes.h b/gio/giotypes.h index 22855ac..e34164d 100644 --- a/gio/giotypes.h +++ b/gio/giotypes.h @@ -106,7 +106,7 @@ typedef struct _GIOExtension GIOExtension; /** * GIOSchedulerJob: * - * Opaque class for definining and scheduling IO jobs. + * Opaque class for defining and scheduling IO jobs. **/ typedef struct _GIOSchedulerJob GIOSchedulerJob; typedef struct _GIOStreamAdapter GIOStreamAdapter; diff --git a/gio/gloadableicon.c b/gio/gloadableicon.c index db86fd0..441eb1b 100644 --- a/gio/gloadableicon.c +++ b/gio/gloadableicon.c @@ -65,7 +65,7 @@ g_loadable_icon_default_init (GLoadableIconIface *iface) * @type: (out) (allow-none): a location to store the type of the * loaded icon, %NULL to ignore. * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Loads a loadable icon. For the asynchronous version of this function, @@ -123,7 +123,7 @@ g_loadable_icon_load_async (GLoadableIcon *icon, * @icon: a #GLoadableIcon. * @res: a #GAsyncResult. * @type: a location to store the type of the loaded icon, %NULL to ignore. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Finishes an asynchronous icon load started in g_loadable_icon_load_async(). diff --git a/gio/glocalfile.c b/gio/glocalfile.c index bc810bf..610d606 100644 --- a/gio/glocalfile.c +++ b/gio/glocalfile.c @@ -925,7 +925,7 @@ g_local_file_query_filesystem_info (GFile *file, /* Many backends can't report free size (for instance the gvfs fuse backend for backend not supporting this), and set f_bfree to 0, - but it can be 0 for real too. We treat the availible == 0 and + but it can be 0 for real too. We treat the available == 0 and free == 0 case as "both of these are invalid". */ #ifndef G_OS_WIN32 diff --git a/gio/gmount.c b/gio/gmount.c index 4868fad..c720dc5 100644 --- a/gio/gmount.c +++ b/gio/gmount.c @@ -372,7 +372,7 @@ g_mount_unmount (GMount *mount, * g_mount_unmount_finish: * @mount: a #GMount. * @result: a #GAsyncResult. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Finishes unmounting a mount. If any errors occurred during the operation, @@ -451,7 +451,7 @@ g_mount_eject (GMount *mount, * g_mount_eject_finish: * @mount: a #GMount. * @result: a #GAsyncResult. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Finishes ejecting a mount. If any errors occurred during the operation, @@ -535,7 +535,7 @@ g_mount_unmount_with_operation (GMount *mount, * g_mount_unmount_with_operation_finish: * @mount: a #GMount. * @result: a #GAsyncResult. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Finishes unmounting a mount. If any errors occurred during the operation, @@ -622,7 +622,7 @@ g_mount_eject_with_operation (GMount *mount, * g_mount_eject_with_operation_finish: * @mount: a #GMount. * @result: a #GAsyncResult. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Finishes ejecting a mount. If any errors occurred during the operation, @@ -710,7 +710,7 @@ g_mount_remount (GMount *mount, * g_mount_remount_finish: * @mount: a #GMount. * @result: a #GAsyncResult. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Finishes remounting a mount. If any errors occurred during the operation, @@ -794,10 +794,10 @@ g_mount_guess_content_type (GMount *mount, * g_mount_guess_content_type_finish: * @mount: a #GMount * @result: a #GAsyncResult - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore * - * Finishes guessing content types of @mount. If any errors occured + * Finishes guessing content types of @mount. If any errors occurred * during the operation, @error will be set to contain the errors and * %FALSE will be returned. In particular, you may get an * %G_IO_ERROR_NOT_SUPPORTED if the mount does not support content @@ -835,7 +835,7 @@ g_mount_guess_content_type_finish (GMount *mount, * @force_rescan: Whether to force a rescan of the content. * Otherwise a cached result will be used if available * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore * * Tries to guess the type of content stored on @mount. Returns one or diff --git a/gio/goutputstream.c b/gio/goutputstream.c index cac5c92..8132caf 100644 --- a/gio/goutputstream.c +++ b/gio/goutputstream.c @@ -151,7 +151,7 @@ g_output_stream_init (GOutputStream *stream) * @buffer: (array length=count) (element-type guint8): the buffer containing the data to write. * @count: the number of bytes to write * @cancellable: (allow-none): optional cancellable object - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * * Tries to write @count bytes from @buffer into the stream. Will block * during the operation. @@ -232,7 +232,7 @@ g_output_stream_write (GOutputStream *stream, * @bytes_written: (out): location to store the number of bytes that was * written to the stream * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * * Tries to write @count bytes from @buffer into the stream. Will block * during the operation. @@ -291,7 +291,7 @@ g_output_stream_write_all (GOutputStream *stream, * g_output_stream_flush: * @stream: a #GOutputStream. * @cancellable: (allow-none): optional cancellable object - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * * Flushed any outstanding buffers in the stream. Will block during * the operation. Closing the stream will implicitly cause a flush. @@ -342,7 +342,7 @@ g_output_stream_flush (GOutputStream *stream, * @source: a #GInputStream. * @flags: a set of #GOutputStreamSpliceFlags. * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Splices an input stream into an output stream. @@ -475,7 +475,7 @@ g_output_stream_real_splice (GOutputStream *stream, * g_output_stream_close: * @stream: A #GOutputStream. * @cancellable: (allow-none): optional cancellable object - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * * Closes the stream, releasing resources related to it. * @@ -755,7 +755,7 @@ g_output_stream_write_async (GOutputStream *stream, * g_output_stream_write_finish: * @stream: a #GOutputStream. * @result: a #GAsyncResult. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Finishes a stream write operation. @@ -881,7 +881,7 @@ g_output_stream_splice_async (GOutputStream *stream, * g_output_stream_splice_finish: * @stream: a #GOutputStream. * @result: a #GAsyncResult. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Finishes an asynchronous stream splice operation. @@ -974,12 +974,12 @@ g_output_stream_flush_async (GOutputStream *stream, * g_output_stream_flush_finish: * @stream: a #GOutputStream. * @result: a GAsyncResult. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Finishes flushing an output stream. * - * Returns: %TRUE if flush operation suceeded, %FALSE otherwise. + * Returns: %TRUE if flush operation succeeded, %FALSE otherwise. **/ gboolean g_output_stream_flush_finish (GOutputStream *stream, @@ -1096,7 +1096,7 @@ g_output_stream_close_async (GOutputStream *stream, * g_output_stream_close_finish: * @stream: a #GOutputStream. * @result: a #GAsyncResult. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Closes an output stream. @@ -1185,7 +1185,7 @@ g_output_stream_has_pending (GOutputStream *stream) /** * g_output_stream_set_pending: * @stream: a #GOutputStream. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Sets @stream to have actions pending. If the pending flag is diff --git a/gio/gproxyaddressenumerator.c b/gio/gproxyaddressenumerator.c index 460c30c..b7bc04d 100644 --- a/gio/gproxyaddressenumerator.c +++ b/gio/gproxyaddressenumerator.c @@ -131,7 +131,7 @@ next_enumerator (GProxyAddressEnumeratorPrivate *priv) if (priv->proxy_type == NULL) continue; - /* Assumes hostnames are supported for unkown protocols */ + /* Assumes hostnames are supported for unknown protocols */ priv->supports_hostname = TRUE; proxy = g_proxy_get_default_for_protocol (priv->proxy_type); if (proxy) diff --git a/gio/gregistrysettingsbackend.c b/gio/gregistrysettingsbackend.c index 3b3f20a..a9774f2 100644 --- a/gio/gregistrysettingsbackend.c +++ b/gio/gregistrysettingsbackend.c @@ -250,7 +250,7 @@ parse_key (const gchar *key_name, gchar *path_name, *c; /* All key paths are treated as absolute; gsettings doesn't seem to enforce a - * preceeding /. + * preceding /. */ if (key_name[0] == '/') key_name ++; @@ -621,7 +621,7 @@ registry_cache_get_node_for_key (GNode *root, if (key_name[0] == '/') key_name ++; - /* Ignore preceeding / */ + /* Ignore preceding / */ component = g_strdup (key_name); c = strchr (component, '/'); if (c != NULL) diff --git a/gio/gseekable.c b/gio/gseekable.c index cde639b..ac77b12 100644 --- a/gio/gseekable.c +++ b/gio/gseekable.c @@ -90,7 +90,7 @@ g_seekable_can_seek (GSeekable *seekable) * @offset: a #goffset. * @type: a #GSeekType. * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Seeks in the stream by the given @offset, modified by @type. @@ -144,7 +144,7 @@ g_seekable_can_truncate (GSeekable *seekable) * @seekable: a #GSeekable. * @offset: a #goffset. * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Truncates a stream with a given #offset. diff --git a/gio/gsettings.c b/gio/gsettings.c index f9e476b..e56697d 100644 --- a/gio/gsettings.c +++ b/gio/gsettings.c @@ -636,7 +636,7 @@ g_settings_class_init (GSettingsClass *class) * * The default handler for this signal invokes the "changed" signal * for each affected key. If any other connected handler returns - * %TRUE then this default functionality will be supressed. + * %TRUE then this default functionality will be suppressed. */ g_settings_signals[SIGNAL_CHANGE_EVENT] = g_signal_new ("change-event", G_TYPE_SETTINGS, @@ -690,7 +690,7 @@ g_settings_class_init (GSettingsClass *class) * changes in writability might also imply changes in value (if for * example, a new mandatory setting is introduced). If any other * connected handler returns %TRUE then this default functionality - * will be supressed. + * will be suppressed. */ g_settings_signals[SIGNAL_WRITABLE_CHANGE_EVENT] = g_signal_new ("writable-change-event", G_TYPE_SETTINGS, @@ -1482,7 +1482,7 @@ g_settings_get_flags (GSettings *settings, * @returns: %TRUE, if the set succeeds * * Looks up the flags type nicks for the bits specified by @value, puts - * them in an array of strings and writes the array to @key, withing + * them in an array of strings and writes the array to @key, within * @settings. * * It is a programmer error to give a @key that isn't contained in the diff --git a/gio/gsettingsbackend.c b/gio/gsettingsbackend.c index 9deaa8e..4757d63 100644 --- a/gio/gsettingsbackend.c +++ b/gio/gsettingsbackend.c @@ -190,7 +190,7 @@ g_settings_backend_watch_weak_notify (gpointer data, * that appears as an argument to some of the callbacks, you *must* have * @context as %NULL. Otherwise, you are subject to cross-thread * dispatching and whatever owned @origin_tag at the time that the event - * occured may no longer own it. This is a problem if you consider that + * occurred may no longer own it. This is a problem if you consider that * you may now be the new owner of that address and mistakenly think * that the event in question originated from yourself. * @@ -378,7 +378,7 @@ g_settings_backend_dispatch_signal (GSettingsBackend *backend, * dispatching the signal later. * * The implementation may call this function at any other time it likes - * in response to other events (such as changes occuring outside of the + * in response to other events (such as changes occurring outside of the * program). These calls may originate from a mainloop or may originate * in response to any other action (including from calls to * g_settings_backend_write()). diff --git a/gio/gsimplepermission.c b/gio/gsimplepermission.c index c932c2c..683ca12 100644 --- a/gio/gsimplepermission.c +++ b/gio/gsimplepermission.c @@ -32,7 +32,7 @@ * * #GSimplePermission is a trivial implementation of #GPermission that * represents a permission that is either always or never allowed. The - * value is given at constuction and doesn't change. + * value is given at construction and doesn't change. * * Calling request or release will result in errors. **/ diff --git a/gio/gsocket.c b/gio/gsocket.c index 77d2d2c..2ee0b5c 100644 --- a/gio/gsocket.c +++ b/gio/gsocket.c @@ -2084,7 +2084,7 @@ g_socket_send_to (GSocket *socket, * * Shut down part of a full-duplex connection. * - * If @shutdown_read is %TRUE then the recieving side of the connection + * If @shutdown_read is %TRUE then the receiving side of the connection * is shut down, and further reading is disallowed. * * If @shutdown_write is %TRUE then the sending side of the connection diff --git a/gio/gsocketaddress.c b/gio/gsocketaddress.c index 5d4ed26..1c110a0 100644 --- a/gio/gsocketaddress.c +++ b/gio/gsocketaddress.c @@ -171,7 +171,7 @@ g_socket_address_get_native_size (GSocketAddress *address) * sockaddr, which can be passed to low-level functions like * connect() or bind(). * - * If not enough space is availible, a %G_IO_ERROR_NO_SPACE error is + * If not enough space is available, a %G_IO_ERROR_NO_SPACE error is * returned. If the address type is not known on the system * then a %G_IO_ERROR_NOT_SUPPORTED error is returned. * diff --git a/gio/gsocks5proxy.c b/gio/gsocks5proxy.c index a4da21e..b4c49a0 100644 --- a/gio/gsocks5proxy.c +++ b/gio/gsocks5proxy.c @@ -349,7 +349,7 @@ parse_connect_reply (const guint8 *data, gint *atype, GError **error) default: g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_PROXY_FAILED, - _("The SOCKSv5 proxy server uses unkown address type.")); + _("The SOCKSv5 proxy server uses unknown address type.")); return FALSE; } break; @@ -444,7 +444,7 @@ g_socks5_proxy_connect (GProxy *proxy, goto error; } - /* Recieve SOCKS5 response and reply with authentication if required */ + /* Receive SOCKS5 response and reply with authentication if required */ { guint8 data[SOCKS5_NEGO_REP_LEN]; gboolean must_auth = FALSE; diff --git a/gio/gunionvolumemonitor.c b/gio/gunionvolumemonitor.c index 5320b04..931846e 100644 --- a/gio/gunionvolumemonitor.c +++ b/gio/gunionvolumemonitor.c @@ -639,7 +639,7 @@ _g_mount_get_for_mount_path (const gchar *mount_path, * blocks of a block device that is already represented by the native * volume monitor (for example a CD Audio file system driver). Such * a driver will generate its own #GMount object that needs to be - * assoicated with the #GVolume object that represents the volume. + * associated with the #GVolume object that represents the volume. * * The other is for implementing a #GVolumeMonitor whose sole purpose * is to return #GVolume objects representing entries in the users diff --git a/gio/gvolume.c b/gio/gvolume.c index 8e96288..2f4cb61 100644 --- a/gio/gvolume.c +++ b/gio/gvolume.c @@ -343,7 +343,7 @@ g_volume_mount (GVolume *volume, * @result: a #GAsyncResult * @error: a #GError location to store an error, or %NULL to ignore * - * Finishes mounting a volume. If any errors occured during the operation, + * Finishes mounting a volume. If any errors occurred during the operation, * @error will be set to contain the errors and %FALSE will be returned. * * If the mount operation succeeded, g_volume_get_mount() on @volume @@ -419,7 +419,7 @@ g_volume_eject (GVolume *volume, * @result: a #GAsyncResult. * @error: a #GError location to store an error, or %NULL to ignore * - * Finishes ejecting a volume. If any errors occured during the operation, + * Finishes ejecting a volume. If any errors occurred during the operation, * @error will be set to contain the errors and %FALSE will be returned. * * Returns: %TRUE, %FALSE if operation failed. @@ -499,7 +499,7 @@ g_volume_eject_with_operation (GVolume *volume, * g_volume_eject_with_operation_finish: * @volume: a #GVolume. * @result: a #GAsyncResult. - * @error: a #GError location to store the error occuring, or %NULL to + * @error: a #GError location to store the error occurring, or %NULL to * ignore. * * Finishes ejecting a volume. If any errors occurred during the operation, diff --git a/gio/gwin32mount.c b/gio/gwin32mount.c index b40412f..cb1855c 100644 --- a/gio/gwin32mount.c +++ b/gio/gwin32mount.c @@ -120,7 +120,7 @@ _win32_get_displayname (const char *drive) * _g_win32_mount_new: * @volume_monitor: a #GVolumeMonitor. * @path: a win32 path. - * @volume: ususally NULL + * @volume: usually NULL * * Returns: a #GWin32Mount for the given win32 path. **/ diff --git a/gio/strinfo.c b/gio/strinfo.c index cfefe13..784dd8a 100644 --- a/gio/strinfo.c +++ b/gio/strinfo.c @@ -86,7 +86,7 @@ * * xfe 'b' 'a' 'z' x00 x00 x00 xff * - * The integer immediately preceeding the match then contains the offset + * The integer immediately preceding the match then contains the offset * of the integer value of the target. In our example, that's '3'. * This index is dereferenced to find the enum value of '2'. * @@ -97,7 +97,7 @@ * To lookup the enum nick for a given value, the value is searched for * in the array. To ensure that the value isn't matching the inside of a * string, we must check that it is either the first item in the array or - * immediately preceeded by the byte 0xff. It must also be immediately + * immediately preceded by the byte 0xff. It must also be immediately * followed by the byte 0xff. * * Because strings always take up a minimum of 2 words, because 0xff or diff --git a/glib/gbsearcharray.h b/glib/gbsearcharray.h index 1ad893c..98822cb 100644 --- a/glib/gbsearcharray.h +++ b/glib/gbsearcharray.h @@ -30,7 +30,7 @@ G_BEGIN_DECLS /* c++ guards */ * implementation needs to be self-contained within this file. */ -/* convenience macro to avoid signed overflow for value comparisions */ +/* convenience macro to avoid signed overflow for value comparisons */ #define G_BSEARCH_ARRAY_CMP(v1,v2) ((v1) > (v2) ? +1 : (v1) == (v2) ? 0 : -1) diff --git a/glib/gconvert.c b/glib/gconvert.c index fd669aa..c5845ca 100644 --- a/glib/gconvert.c +++ b/glib/gconvert.c @@ -681,7 +681,7 @@ close_converter (GIConv cd) * input sequence. * @bytes_written: the number of bytes stored in the output buffer (not * including the terminating nul). - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * errors. Any of the errors in #GConvertError may occur. * * Converts a string from one character set to another. @@ -847,7 +847,7 @@ g_convert_with_iconv (const gchar *str, * input sequence. * @bytes_written: (out): the number of bytes stored in the output buffer (not * including the terminating nul). - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * errors. Any of the errors in #GConvertError may occur. * * Converts a string from one character set to another. @@ -916,7 +916,7 @@ g_convert (const gchar *str, * at the end of the input. * @bytes_written: the number of bytes stored in the output buffer (not * including the terminating nul). - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * errors. Any of the errors in #GConvertError may occur. * * Converts a string from one character set to another, possibly @@ -1197,7 +1197,7 @@ strdup_len (const gchar *string, * input sequence. * @bytes_written: the number of bytes stored in the output buffer (not * including the terminating nul). - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * errors. Any of the errors in #GConvertError may occur. * * Converts a string which is in the encoding used for strings by @@ -1238,7 +1238,7 @@ g_locale_to_utf8 (const gchar *opsysstring, * input sequence. * @bytes_written: the number of bytes stored in the output buffer (not * including the terminating nul). - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * errors. Any of the errors in #GConvertError may occur. * * Converts a string from UTF-8 to the encoding used for strings by @@ -1450,7 +1450,7 @@ _g_convert_thread_init (void) * input sequence. * @bytes_written: the number of bytes stored in the output buffer (not * including the terminating nul). - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * errors. Any of the errors in #GConvertError may occur. * * Converts a string which is in the encoding used by GLib for @@ -1522,7 +1522,7 @@ g_filename_to_utf8 (const gchar *opsysstring, * input sequence. * @bytes_written: the number of bytes stored in the output buffer (not * including the terminating nul). - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * errors. Any of the errors in #GConvertError may occur. * * Converts a string from UTF-8 to the encoding GLib uses for @@ -1853,7 +1853,7 @@ hostname_validate (const char *hostname) * @hostname: Location to store hostname for the URI, or %NULL. * If there is no hostname in the URI, %NULL will be * stored in this location. - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * errors. Any of the errors in #GConvertError may occur. * * Converts an escaped ASCII-encoded URI to a local filename in the @@ -2012,7 +2012,7 @@ g_filename_from_uri (const gchar *uri, * which is the on-disk file name bytes on Unix, and UTF-8 on * Windows * @hostname: (allow-none): A UTF-8 encoded hostname, or %NULL for none. - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * errors. Any of the errors in #GConvertError may occur. * * Converts an absolute filename to an escaped ASCII-encoded URI, with the path diff --git a/glib/gdataset.c b/glib/gdataset.c index 2bbb2b3..ce6d1b7 100644 --- a/glib/gdataset.c +++ b/glib/gdataset.c @@ -1091,7 +1091,7 @@ g_data_initialize (void) * g_intern_static_string(). An interned string is a canonical * representation for a string. One important advantage of interned * strings is that they can be compared for equality by a simple - * pointer comparision, rather than using strcmp(). + * pointer comparison, rather than using strcmp(). **/ /** diff --git a/glib/gdatetime.c b/glib/gdatetime.c index 7885823..38cacbe 100644 --- a/glib/gdatetime.c +++ b/glib/gdatetime.c @@ -1635,15 +1635,15 @@ g_date_time_get_day_of_month (GDateTime *datetime) * within a complete week (Monday to Sunday) is contained within the * same week-numbering year. * - * For Monday, Tuesday and Wednesday occuring near the end of the year, + * For Monday, Tuesday and Wednesday occurring near the end of the year, * this may mean that the week-numbering year is one greater than the * calendar year (so that these days have the same week-numbering year - * as the Thursday occuring early in the next year). + * as the Thursday occurring early in the next year). * - * For Friday, Saturaday and Sunday occuring near the start of the year, + * For Friday, Saturaday and Sunday occurring near the start of the year, * this may mean that the week-numbering year is one less than the * calendar year (so that these days have the same week-numbering year - * as the Thursday occuring late in the previous year). + * as the Thursday occurring late in the previous year). * * An equivalent description is that the week-numbering year is equal to * the calendar year containing the majority of the days in the current @@ -1706,7 +1706,7 @@ g_date_time_get_week_numbering_year (GDateTime *datetime) * that has more than 4 of its days falling within the calendar year. * * The value 0 is never returned by this function. Days contained - * within a year but occuring before the first ISO 8601 week of that + * within a year but occurring before the first ISO 8601 week of that * year are considered as being contained in the last week of the * previous year. Similarly, the final days of a calendar year may be * considered as being part of the first ISO 8601 week of the next year diff --git a/glib/gfileutils.c b/glib/gfileutils.c index 23b1624..768f8c7 100644 --- a/glib/gfileutils.c +++ b/glib/gfileutils.c @@ -1075,7 +1075,7 @@ write_to_temp_file (const gchar *contents, * * * - * If the call was sucessful, it returns %TRUE. If the call was not successful, + * If the call was successful, it returns %TRUE. If the call was not successful, * it returns %FALSE and sets @error. The error domain is #G_FILE_ERROR. * Possible error codes are those in the #GFileError enumeration. * diff --git a/glib/gmain.c b/glib/gmain.c index 9c3c758..75c2c0e 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -3467,7 +3467,7 @@ g_main_context_poll (GMainContext *context, * file descriptor is polled whenever the results may be needed. * * Adds a file descriptor to the set of file descriptors polled for - * this context. This will very seldomly be used directly. Instead + * this context. This will very seldom be used directly. Instead * a typical event source will use g_source_add_poll() instead. **/ void diff --git a/glib/gregex.c b/glib/gregex.c index 0e8a429..d07036b 100644 --- a/glib/gregex.c +++ b/glib/gregex.c @@ -581,7 +581,7 @@ g_match_info_free (GMatchInfo *match_info) /** * g_match_info_next: * @match_info: a #GMatchInfo structure - * @error: location to store the error occuring, or %NULL to ignore errors + * @error: location to store the error occurring, or %NULL to ignore errors * * Scans for the next match using the same parameters of the previous * call to g_regex_match_full() or g_regex_match() that returned @@ -780,7 +780,7 @@ g_match_info_is_partial_match (const GMatchInfo *match_info) * g_match_info_expand_references: * @match_info: a #GMatchInfo or %NULL * @string_to_expand: the string to expand - * @error: location to store the error occuring, or %NULL to ignore errors + * @error: location to store the error occurring, or %NULL to ignore errors * * Returns a new string containing the text in @string_to_expand with * references and escape sequences expanded. References refer to the last @@ -1526,7 +1526,7 @@ g_regex_match (const GRegex *regex, * @match_options: match options * @match_info: (out) (allow-none): pointer to location where to store * the #GMatchInfo, or %NULL if you do not need it - * @error: location to store the error occuring, or %NULL to ignore errors + * @error: location to store the error occurring, or %NULL to ignore errors * * Scans for a match in string for the pattern in @regex. * The @match_options are combined with the match options specified @@ -1657,10 +1657,10 @@ g_regex_match_all (const GRegex *regex, * @match_options: match options * @match_info: (out) (allow-none): pointer to location where to store * the #GMatchInfo, or %NULL if you do not need it - * @error: location to store the error occuring, or %NULL to ignore errors + * @error: location to store the error occurring, or %NULL to ignore errors * * Using the standard algorithm for regular expression matching only - * the longest match in the string is retrieved, it is not possibile + * the longest match in the string is retrieved, it is not possible * to obtain all the available matches. For instance matching * "<a> <b> <c>" against the pattern "<.*>" * you get "<a> <b> <c>". @@ -2527,7 +2527,7 @@ interpolation_list_needs_match (GList *list) * @start_position: starting index of the string to match * @replacement: text to replace each match with * @match_options: options for the match - * @error: location to store the error occuring, or %NULL to ignore errors + * @error: location to store the error occurring, or %NULL to ignore errors * * Replaces all occurrences of the pattern in @regex with the * replacement text. Backreferences of the form '\number' or @@ -2639,7 +2639,7 @@ literal_replacement (const GMatchInfo *match_info, * @start_position: starting index of the string to match * @replacement: text to replace each match with * @match_options: options for the match - * @error: location to store the error occuring, or %NULL to ignore errors + * @error: location to store the error occurring, or %NULL to ignore errors * * Replaces all occurrences of the pattern in @regex with the * replacement text. @replacement is replaced literally, to @@ -2683,7 +2683,7 @@ g_regex_replace_literal (const GRegex *regex, * @match_options: options for the match * @eval: a function to call for each match * @user_data: user data to pass to the function - * @error: location to store the error occuring, or %NULL to ignore errors + * @error: location to store the error occurring, or %NULL to ignore errors * * Replaces occurrences of the pattern in regex with the output of * @eval for that occurrence. diff --git a/glib/gregex.h b/glib/gregex.h index 666b487..bc5fff8 100644 --- a/glib/gregex.h +++ b/glib/gregex.h @@ -338,7 +338,7 @@ typedef struct _GMatchInfo GMatchInfo; * @user_data: user data passed to g_regex_replace_eval() * * Specifies the type of the function passed to g_regex_replace_eval(). - * It is called for each occurance of the pattern in the string passed + * It is called for each occurrence of the pattern in the string passed * to g_regex_replace_eval(), and it should append the replacement to * @result. * diff --git a/glib/gslice.c b/glib/gslice.c index 76bcf04..2160772 100644 --- a/glib/gslice.c +++ b/glib/gslice.c @@ -214,7 +214,7 @@ static SliceConfig slice_config = { }; static GMutex *smc_tree_mutex = NULL; /* mutex for G_SLICE=debug-blocks */ -/* --- auxillary funcitons --- */ +/* --- auxiliary funcitons --- */ void g_slice_set_config (GSliceConfig ckey, gint64 value) @@ -1038,7 +1038,7 @@ allocator_add_slab (Allocator *allocator, mem_error ("failed to allocate %u bytes (alignment: %u): %s\n", (guint) (page_size - NATIVE_MALLOC_PADDING), (guint) page_size, syserr); } - /* mask page adress */ + /* mask page address */ addr = ((gsize) mem / page_size) * page_size; /* assert alignment */ mem_assert (aligned_memory == (gpointer) addr); @@ -1094,7 +1094,7 @@ slab_allocator_free_chunk (gsize chunk_size, guint ix = SLAB_INDEX (allocator, chunk_size); gsize page_size = allocator_aligned_page_size (allocator, SLAB_BPAGE_SIZE (allocator, chunk_size)); gsize addr = ((gsize) mem / page_size) * page_size; - /* mask page adress */ + /* mask page address */ guint8 *page = (guint8*) addr; SlabInfo *sinfo = (SlabInfo*) (page + page_size - SLAB_INFO_SIZE); /* assert valid chunk count */ diff --git a/glib/gstdio.h b/glib/gstdio.h index 981faa6..08aea7d 100644 --- a/glib/gstdio.h +++ b/glib/gstdio.h @@ -89,7 +89,7 @@ int g_rmdir (const gchar *filename); * Unix, the pathname is a file name as it literally is in the file * system. On well-maintained systems with consistent users who know * what they are doing and no exchange of files with others this would - * be a well-defined encoding, preferrably UTF-8. On Windows, the + * be a well-defined encoding, preferably UTF-8. On Windows, the * pathname is always in UTF-8, even if that is not the on-disk * encoding, and not the encoding accepted by the C library or Win32 * API. diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c index c695c9f..aecde5b 100644 --- a/glib/gstrfuncs.c +++ b/glib/gstrfuncs.c @@ -349,7 +349,7 @@ g_strconcat (const gchar *string1, ...) * if the string is not completely converted it attempts the conversion * again with g_ascii_strtod(), and returns the best match. * - * This function should seldomly be used. The normal situation when reading + * This function should seldom be used. The normal situation when reading * numbers not for human consumption is to use g_ascii_strtod(). Only when * you know that you must expect both locale formatted and C formatted numbers * should you use this. Make sure that you don't pass strings such as comma diff --git a/glib/gthread.c b/glib/gthread.c index 58d76c7..6946975 100644 --- a/glib/gthread.c +++ b/glib/gthread.c @@ -352,7 +352,7 @@ gboolean g_threads_got_initialized = FALSE; /* IMPLEMENTATION NOTE: * * g_thread_functions_for_glib_use is a global symbol that gets used by - * most of the "primative" threading calls. g_mutex_lock(), for + * most of the "primitive" threading calls. g_mutex_lock(), for * example, is just a macro that calls the appropriate virtual function * out of this table. * @@ -1258,7 +1258,7 @@ g_static_mutex_init (GStaticMutex *mutex) * must first allocate the normal GMutex and store it into the pointer. * * configure.ac writes macros into glibconfig.h to determine if - * g_static_mutex_get_mutex() accesses the sturcture in memory directly + * g_static_mutex_get_mutex() accesses the structure in memory directly * (on platforms where we are able to do that) or if it ends up here, * where we may have to allocate the GMutex before returning it. */ @@ -2570,7 +2570,7 @@ g_thread_foreach (GFunc thread_func, for (thread = g_thread_all_threads; thread; thread = thread->next) slist = g_slist_prepend (slist, thread); G_UNLOCK (g_thread); - /* walk the list, skipping non-existant threads */ + /* walk the list, skipping non-existent threads */ while (slist) { GSList *node = slist; diff --git a/glib/gthreadpool.c b/glib/gthreadpool.c index bde519f..c1f097f 100644 --- a/glib/gthreadpool.c +++ b/glib/gthreadpool.c @@ -363,7 +363,7 @@ g_thread_pool_thread_proxy (gpointer data) /* If the pool is not running and another thread is * waiting for this thread pool to finish and there * are either no tasks left or the pool shall stop - * immediatly, inform the waiting thread of a change + * immediately, inform the waiting thread of a change * of the thread pool state. */ g_cond_broadcast (pool->cond); @@ -901,7 +901,7 @@ g_thread_pool_stop_unused_threads (void) * just in the order in which they were added to the pool. * * Note, if the maximum number of threads is more than 1, the order - * that threads are executed cannot be guranteed 100%. Threads are + * that threads are executed cannot be guaranteed 100%. Threads are * scheduled by the operating system and are executed at random. It * cannot be assumed that threads are executed in the order they are * created. diff --git a/glib/gthreadprivate.h b/glib/gthreadprivate.h index c75924c..30357d7 100644 --- a/glib/gthreadprivate.h +++ b/glib/gthreadprivate.h @@ -25,7 +25,7 @@ G_BEGIN_DECLS -/* System thread identifier comparision and assignment */ +/* System thread identifier comparison and assignment */ #if GLIB_SIZEOF_SYSTEM_THREAD == SIZEOF_VOID_P # define g_system_thread_equal_simple(thread1, thread2) \ ((thread1).dummy_pointer == (thread2).dummy_pointer) diff --git a/glib/gtimezone.c b/glib/gtimezone.c index 1c2b26f..780a388 100644 --- a/glib/gtimezone.c +++ b/glib/gtimezone.c @@ -655,7 +655,7 @@ g_time_zone_adjust_time (GTimeZone *tz, * Otherwise @time_ is treated is local time. The distinction between * %G_TIME_TYPE_STANDARD and %G_TIME_TYPE_DAYLIGHT is ignored except in * the case that the given @time_ is ambiguous. In Toronto, for example, - * 01:30 on November 7th 2010 occured twice (once inside of daylight + * 01:30 on November 7th 2010 occurred twice (once inside of daylight * savings time and the next, an hour later, outside of daylight savings * time). In this case, the different value of @type would result in a * different interval being returned. diff --git a/glib/gutf8.c b/glib/gutf8.c index b2a170b..7344e39 100644 --- a/glib/gutf8.c +++ b/glib/gutf8.c @@ -968,7 +968,7 @@ g_utf8_to_ucs4_fast (const gchar *str, * @items_written: location to store number of characters written or %NULL. * The value here stored does not include the trailing 0 * character. - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * errors. Any of the errors in #GConvertError other than * %G_CONVERT_ERROR_NO_CONVERSION may occur. * @@ -1048,7 +1048,7 @@ g_utf8_to_ucs4 (const gchar *str, * @items_written: location to store number of bytes written or %NULL. * The value here stored does not include the trailing 0 * byte. - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * errors. Any of the errors in #GConvertError other than * %G_CONVERT_ERROR_NO_CONVERSION may occur. * @@ -1124,7 +1124,7 @@ g_ucs4_to_utf8 (const gunichar *str, * @items_written: location to store number of bytes written, or %NULL. * The value stored here does not include the trailing * 0 byte. - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * errors. Any of the errors in #GConvertError other than * %G_CONVERT_ERROR_NO_CONVERSION may occur. * @@ -1279,7 +1279,7 @@ g_utf16_to_utf8 (const gunichar2 *str, * @items_written: location to store number of characters written, or %NULL. * The value stored here does not include the trailing * 0 character. - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * errors. Any of the errors in #GConvertError other than * %G_CONVERT_ERROR_NO_CONVERSION may occur. * @@ -1417,7 +1417,7 @@ g_utf16_to_ucs4 (const gunichar2 *str, * @items_written: location to store number of gunichar2 written, * or %NULL. * The value stored here does not include the trailing 0. - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * errors. Any of the errors in #GConvertError other than * %G_CONVERT_ERROR_NO_CONVERSION may occur. * @@ -1532,7 +1532,7 @@ g_utf8_to_utf16 (const gchar *str, * @items_written: location to store number of gunichar2 * written, or %NULL. The value stored here does not * include the trailing 0. - * @error: location to store the error occuring, or %NULL to ignore + * @error: location to store the error occurring, or %NULL to ignore * errors. Any of the errors in #GConvertError other than * %G_CONVERT_ERROR_NO_CONVERSION may occur. * diff --git a/glib/gutils.c b/glib/gutils.c index de7f41e..679bab7 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -1831,7 +1831,7 @@ g_get_any_init_do (void) /* we bail out prematurely if the user id can't be found * (should be pretty rare case actually), or if the buffer * should be sufficiently big and lookups are still not - * successfull. + * successful. */ if (error == 0 || error == ENOENT) { diff --git a/glib/gvariant-parser.c b/glib/gvariant-parser.c index 02ed011..ad21a6f 100644 --- a/glib/gvariant-parser.c +++ b/glib/gvariant-parser.c @@ -2338,7 +2338,7 @@ parse (TokenStream *stream, * is returned. * * In case of any error, %NULL will be returned. If @error is non-%NULL - * then it will be set to reflect the error that occured. + * then it will be set to reflect the error that occurred. * * Officially, the language understood by the parser is "any string * produced by g_variant_print()". diff --git a/glib/gvariant-serialiser.c b/glib/gvariant-serialiser.c index d805bcb..5daf43a 100644 --- a/glib/gvariant-serialiser.c +++ b/glib/gvariant-serialiser.c @@ -511,7 +511,7 @@ gvs_fixed_sized_array_is_normal (GVariantSerialised value) * Variable sized arrays, containing variable-sized elements, must be * able to determine the boundaries between the elements. The items * cannot simply be concatenated. Additionally, we are faced with the - * fact that non-fixed-sized values do not neccessarily have a size that + * fact that non-fixed-sized values do not necessarily have a size that * is a multiple of their alignment requirement, so we may need to * insert zero-filled padding. * @@ -862,7 +862,7 @@ gvs_tuple_get_child (GVariantSerialised value, /* tuples are the only (potentially) fixed-sized containers, so the * only ones that have to deal with the possibility of having %NULL - * data with a non-zero %size if errors occured elsewhere. + * data with a non-zero %size if errors occurred elsewhere. */ if G_UNLIKELY (value.data == NULL && value.size != 0) { diff --git a/glib/gvariant.c b/glib/gvariant.c index fb87f43..db6765c 100644 --- a/glib/gvariant.c +++ b/glib/gvariant.c @@ -243,7 +243,7 @@ * then although there are 9 individual values that comprise the * entire dictionary (two keys, two values, two variants containing * the values, two dictionary entries, plus the dictionary itself), - * only 1 #GVariant instance exists -- the one refering to the + * only 1 #GVariant instance exists -- the one referring to the * dictionary. * * diff --git a/glib/gvarianttypeinfo.c b/glib/gvarianttypeinfo.c index c5998d3..c941e8f 100644 --- a/glib/gvarianttypeinfo.c +++ b/glib/gvarianttypeinfo.c @@ -50,7 +50,7 @@ * for "as" (note that "s" and "v" always exist in the static array). * * The trickiest part of GVariantTypeInfo (and in fact, the major reason - * for its existance) is the storage of somewhat magical constants that + * for its existence) is the storage of somewhat magical constants that * allow for O(1) lookups of items in tuples. This is described below. * * 'container_class' is set to 'a' or 'r' if the GVariantTypeInfo is diff --git a/glib/gvarianttypeinfo.h b/glib/gvarianttypeinfo.h index 7c7b544..aaf14f4 100644 --- a/glib/gvarianttypeinfo.h +++ b/glib/gvarianttypeinfo.h @@ -62,11 +62,11 @@ typedef struct _GVariantTypeInfo GVariantTypeInfo; * size, the end point is a constant addition to the start point. * * It is clear that the starting point of a given item in the tuple is - * determined by the items that preceed it in the tuple. Logically, + * determined by the items that precede it in the tuple. Logically, * the start point of a particular item in a given type of tuple can * be determined entirely by the end point of the nearest * variable-sized item that came before it (or from the start of the - * container itself in case there is no preceeding variable-sized + * container itself in case there is no preceding variable-sized * item). In the case of "(isis)" for example, in order to find out * the start point of the last string, one must start at the end point * of the first string, align to 4 (for the integer's alignment) and @@ -84,7 +84,7 @@ typedef struct _GVariantTypeInfo GVariantTypeInfo; * * First, among the array of offets contained in the tuple, 'i' is the * index of the offset that refers to the end of the variable-sized item - * preceeding the item of interest. If no variable-sized items preceed + * preceding the item of interest. If no variable-sized items precede * this item, then 'i' will be -1. * * Let 'prev_end' be the end offset of the previous item (or 0 in the diff --git a/glib/gwin32.c b/glib/gwin32.c index 9ba02ad..d69f4dd 100644 --- a/glib/gwin32.c +++ b/glib/gwin32.c @@ -525,7 +525,7 @@ _g_win32_thread_init (void) * on NT-based systems, so checking whether your are running on Win9x * in your own software is moot. The least significant byte is 4 on * Windows NT 4, and 5 on Windows XP. Software that needs really - * detailled version and feature information should use Win32 API like + * detailed version and feature information should use Win32 API like * GetVersionEx() and VerifyVersionInfo(). * * Returns: The version information. diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c index 5216138..985e7ad 100644 --- a/gmodule/gmodule.c +++ b/gmodule/gmodule.c @@ -49,7 +49,7 @@ #include "gstdio.h" /* We maintain a list of modules, so we can reference count them. - * That's needed because some platforms don't support refernce counts on + * That's needed because some platforms don't support references counts on * modules e.g. the shl_* implementation of HP-UX * (http://www.stat.umn.edu/~luke/xls/projects/dlbasics/dlbasics.html). * Also, the module for the program itself is kept seperatedly for diff --git a/gmodule/gmodule.h b/gmodule/gmodule.h index 5f18f9d..ead452a 100644 --- a/gmodule/gmodule.h +++ b/gmodule/gmodule.h @@ -87,7 +87,7 @@ const gchar * g_module_name (GModule *module); * some operating systems, in some standard place, for instance on the * PATH. Hence, to be absoultely sure to get the correct module, * always pass in a directory. The file name consists of the directory, - * if supplied, and `module_name' suitably decorated accoring to + * if supplied, and `module_name' suitably decorated according to * the operating system's conventions (for instance lib*.so or *.dll). * * No checks are made that the file exists, or is of correct type. diff --git a/gobject/gboxed.c b/gobject/gboxed.c index f61cc01..944ddc3 100644 --- a/gobject/gboxed.c +++ b/gobject/gboxed.c @@ -297,7 +297,7 @@ g_boxed_type_register_static (const gchar *name, type = g_type_register_static (G_TYPE_BOXED, name, &type_info, 0); - /* install proxy functions upon successfull registration */ + /* install proxy functions upon successful registration */ if (type) _g_type_boxed_init (type, boxed_copy, boxed_free); @@ -340,7 +340,7 @@ g_boxed_copy (GType boxed_type, * (data[0].v_pointer is the boxed struct, and * data[1].v_uint holds the G_VALUE_NOCOPY_CONTENTS flag, * rest zero). - * but then, we can expect that since we layed out the + * but then, we can expect that since we laid out the * g_boxed_*() API. * data[1].v_uint&G_VALUE_NOCOPY_CONTENTS shouldn't be set * after a copy. diff --git a/gobject/gclosure.c b/gobject/gclosure.c index 134d8b0..5fd928b 100644 --- a/gobject/gclosure.c +++ b/gobject/gclosure.c @@ -614,7 +614,7 @@ g_closure_unref (GClosure *closure) * g_closure_sink() checks to see if the object is still floating, and * if so, unsets the floating state and decreases the reference * count. If the closure is not floating, g_closure_sink() does - * nothing. The reason for the existance of the floating state is to + * nothing. The reason for the existence of the floating state is to * prevent cumbersome code sequences like: * |[ * closure = g_cclosure_new (cb_func, cb_data); @@ -656,7 +656,7 @@ g_closure_sink (GClosure *closure) g_return_if_fail (closure->ref_count > 0); /* floating is basically a kludge to avoid creating closures - * with a ref_count of 0. so the intial ref_count a closure has + * with a ref_count of 0. so the initial ref_count a closure has * is unowned. with invoking g_closure_sink() code may * indicate that it takes over that intiial ref_count. */ diff --git a/gobject/glib-genmarshal.c b/gobject/glib-genmarshal.c index 2f7ae86..8afacdb 100644 --- a/gobject/glib-genmarshal.c +++ b/gobject/glib-genmarshal.c @@ -625,7 +625,7 @@ main (int argc, else files = g_slist_prepend (files, "/dev/stdin"); - /* setup auxillary structs */ + /* setup auxiliary structs */ scanner = g_scanner_new (&scanner_config_template); fout = stdout; marshallers = g_hash_table_new (g_str_hash, g_str_equal); diff --git a/gobject/gobject.c b/gobject/gobject.c index b88a276..3488380 100644 --- a/gobject/gobject.c +++ b/gobject/gobject.c @@ -2455,7 +2455,7 @@ g_object_ref_sink (gpointer _object) * * This function is intended for #GObject implementations to re-enforce a * floating object reference. - * Doing this is seldomly required: all + * Doing this is seldom required: all * #GInitiallyUnowneds are created with a floating reference which * usually just needs to be sunken by calling g_object_ref_sink(). * diff --git a/gobject/gobject.h b/gobject/gobject.h index 971f365..bb62c22 100644 --- a/gobject/gobject.h +++ b/gobject/gobject.h @@ -229,7 +229,7 @@ typedef void (*GObjectFinalizeFunc) (GObject *object); * A #GWeakNotify function can be added to an object as a callback that gets * triggered when the object is finalized. Since the object is already being * finalized when the #GWeakNotify is called, there's not much you could do - * with the object, apart from e.g. using its adress as hash-index or the like. + * with the object, apart from e.g. using its address as hash-index or the like. */ typedef void (*GWeakNotify) (gpointer data, GObject *where_the_object_was); @@ -317,7 +317,7 @@ struct _GObjectClass GSList *construct_properties; /*< public >*/ - /* seldomly overidden */ + /* seldom overidden */ GObject* (*constructor) (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties); @@ -332,7 +332,7 @@ struct _GObjectClass GParamSpec *pspec); void (*dispose) (GObject *object); void (*finalize) (GObject *object); - /* seldomly overidden */ + /* seldom overidden */ void (*dispatch_properties_changed) (GObject *object, guint n_pspecs, GParamSpec **pspecs); diff --git a/gobject/gparam.c b/gobject/gparam.c index b29d0fc..b3d44da 100644 --- a/gobject/gparam.c +++ b/gobject/gparam.c @@ -123,7 +123,7 @@ _g_param_type_init (void) /* This should be registred as GParamSpec instead of GParam, for * consistency sake, so that type name can be mapped to struct name, - * However, some language bindings, most noticable the python ones + * However, some language bindings, most noticeable the python ones * depends on the "GParam" identifier, see #548689 */ type = g_type_register_fundamental (G_TYPE_PARAM, g_intern_static_string ("GParam"), ¶m_spec_info, &finfo, G_TYPE_FLAG_ABSTRACT); @@ -1315,7 +1315,7 @@ g_param_spec_pool_list (GParamSpecPool *pool, } -/* --- auxillary functions --- */ +/* --- auxiliary functions --- */ typedef struct { /* class portion */ diff --git a/gobject/gparam.h b/gobject/gparam.h index 0a5240a..07855ee 100644 --- a/gobject/gparam.h +++ b/gobject/gparam.h @@ -263,7 +263,7 @@ struct _GParamSpecClass * The GParameter struct is an auxiliary structure used * to hand parameter name/value pairs to g_object_newv(). */ -struct _GParameter /* auxillary structure for _setv() variants */ +struct _GParameter /* auxiliary structure for _setv() variants */ { const gchar *name; GValue value; diff --git a/gobject/gsignal.c b/gobject/gsignal.c index 80c3627..98534be 100644 --- a/gobject/gsignal.c +++ b/gobject/gsignal.c @@ -2076,7 +2076,7 @@ g_signal_chain_from_overridden_handler (gpointer instance, g_free (error); /* we purposely leak the value here, it might not be - * in a sane state if an error condition occured + * in a sane state if an error condition occurred */ } } @@ -3024,7 +3024,7 @@ g_signal_emit_valist (gpointer instance, g_free (error); /* we purposely leak the value here, it might not be - * in a sane state if an error condition occured + * in a sane state if an error condition occurred */ } } diff --git a/gobject/gtype.c b/gobject/gtype.c index d543117..096a8c5 100644 --- a/gobject/gtype.c +++ b/gobject/gtype.c @@ -1079,7 +1079,7 @@ type_data_make_W (TypeNode *node, vtable_size += 2; } - if (node->is_instantiatable) /* carefull, is_instantiatable is also is_classed */ + if (node->is_instantiatable) /* careful, is_instantiatable is also is_classed */ { TypeNode *pnode = lookup_type_node_I (NODE_PARENT_TYPE (node)); @@ -1559,7 +1559,7 @@ g_type_interface_add_prerequisite (GType interface_type, { guint i; - /* can have at most one publically installable instantiatable prerequisite */ + /* can have at most one publicly installable instantiatable prerequisite */ for (i = 0; i < IFACE_NODE_N_PREREQUISITES (iface); i++) { TypeNode *prnode = lookup_type_node_I (IFACE_NODE_PREREQUISITES (iface)[i]); diff --git a/gobject/gvaluearray.c b/gobject/gvaluearray.c index 2f1028a..56d2707 100644 --- a/gobject/gvaluearray.c +++ b/gobject/gvaluearray.c @@ -294,7 +294,7 @@ g_value_array_remove (GValueArray *value_array, * @value_array: #GValueArray to sort * @compare_func: (scope call): function to compare elements * - * Sort @value_array using @compare_func to compare the elements accoring to + * Sort @value_array using @compare_func to compare the elements according to * the semantics of #GCompareFunc. * * The current implementation uses Quick-Sort as sorting algorithm. @@ -321,7 +321,7 @@ g_value_array_sort (GValueArray *value_array, * @compare_func: (scope call): function to compare elements * @user_data: (closure): extra data argument provided for @compare_func * - * Sort @value_array using @compare_func to compare the elements accoring + * Sort @value_array using @compare_func to compare the elements according * to the semantics of #GCompareDataFunc. * * The current implementation uses Quick-Sort as sorting algorithm. diff --git a/tests/memchunks.c b/tests/memchunks.c index 7a08de0..e4e2f0b 100644 --- a/tests/memchunks.c +++ b/tests/memchunks.c @@ -253,7 +253,7 @@ old_mem_chunk_alloc (GMemChunk *mem_chunk) * (ie marked to be destroyed). * We check to see if all of the segments on the free list that * reference this area have been removed. This occurs when - * the ammount of free memory is less than the allocatable size. + * the amount of free memory is less than the allocatable size. * If the chunk should be freed, then we place it in the "free_mem_area". * This is so we make sure not to free the mem area here and then * allocate it again a few lines down. diff --git a/tests/threadpool-test.c b/tests/threadpool-test.c index 4d011ff..cc22103 100644 --- a/tests/threadpool-test.c +++ b/tests/threadpool-test.c @@ -11,7 +11,7 @@ #define WAIT 5 /* seconds */ #define MAX_THREADS 10 -/* if > 0 the test will run continously (since the test ends when +/* if > 0 the test will run continuously (since the test ends when * thread count is 0), if -1 it means no limit to unused threads * if 0 then no unused threads are possible */ #define MAX_UNUSED_THREADS -1 @@ -276,7 +276,7 @@ test_thread_sort (gboolean sort) } /* It is important that we only have a maximum of 1 thread for this - * test since the results can not be guranteed to be sorted if > 1. + * test since the results can not be guaranteed to be sorted if > 1. * * Threads are scheduled by the operating system and are executed at * random. It cannot be assumed that threads are executed in the -- 2.7.4