Commit 1b28408b authored by Matthias Clasen's avatar Matthias Clasen
Browse files

Spelling fixes

Spelling fixes in comments and docs, provided by
Kjartan Maraas in bug 657336.
parent 5763c631
......@@ -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.
*
......
......@@ -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.
......
......@@ -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.
......
......@@ -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.
......
......@@ -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,
......
......@@ -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
......
......@@ -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.
*
......
......@@ -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,
......
......@@ -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.
*
......
......@@ -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,
......
......@@ -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 @file<!-- -->s pathname match @prefix.
* if the names of initial elements of @file<!-- -->s 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);
......
......@@ -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
......
......@@ -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().
......
......@@ -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.
......
......@@ -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);
}
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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.
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment