mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-25 15:06:14 +01:00
Corrected some typos in the documentation: occured -> occurred. its ->
2008-01-16 Murray Cumming <murrayc@murrayc.com> * gappinfo.c: * gdatainputstream.c: * gfile.c: * gfileoutputstream.c: * ginputstream.c: * gmount.c: * goutputstream.c: * gseekable.c: * gunixmounts.c: Corrected some typos in the documentation: occured -> occurred. its -> it's (where appropriate). svn path=/trunk/; revision=6322
This commit is contained in:
parent
f970f886cb
commit
f0749cc896
@ -1,3 +1,17 @@
|
||||
2008-01-16 Murray Cumming <murrayc@murrayc.com>
|
||||
|
||||
* gappinfo.c:
|
||||
* gdatainputstream.c:
|
||||
* gfile.c:
|
||||
* gfileoutputstream.c:
|
||||
* ginputstream.c:
|
||||
* gmount.c:
|
||||
* goutputstream.c:
|
||||
* gseekable.c:
|
||||
* gunixmounts.c: Corrected some typos in the documentation:
|
||||
occured -> occurred.
|
||||
its -> it's (where appropriate).
|
||||
|
||||
2008-01-16 Alexander Larsson <alexl@redhat.com>
|
||||
|
||||
* gfile.[ch]:
|
||||
|
@ -397,7 +397,7 @@ g_app_info_get_icon (GAppInfo *appinfo)
|
||||
*
|
||||
* Launches the application. Passes @files to the launched application
|
||||
* as arguments, using the optional @launch_context to get information
|
||||
* about the details of the launcher (like what screen its is on).
|
||||
* about the details of the launcher (like what screen it is on).
|
||||
* On error, @error will be set accordingly.
|
||||
*
|
||||
* To lauch the application without arguments pass a %NULL @files list.
|
||||
@ -475,7 +475,7 @@ g_app_info_supports_files (GAppInfo *appinfo)
|
||||
*
|
||||
* Launches the application. Passes @uris to the launched application
|
||||
* as arguments, using the optional @launch_context to get information
|
||||
* about the details of the launcher (like what screen its is on).
|
||||
* about the details of the launcher (like what screen it is on).
|
||||
* On error, @error will be set accordingly.
|
||||
*
|
||||
* To lauch the application without arguments pass a %NULL @uris list.
|
||||
|
@ -329,7 +329,7 @@ read_data (GDataInputStream *stream,
|
||||
* Reads an unsigned 8-bit/1-byte value from @stream.
|
||||
*
|
||||
* Returns: an unsigned 8-bit/1-byte value read from the @stream or %0
|
||||
* if an error occured.
|
||||
* if an error occurred.
|
||||
**/
|
||||
guchar
|
||||
g_data_input_stream_read_byte (GDataInputStream *stream,
|
||||
@ -359,7 +359,7 @@ g_data_input_stream_read_byte (GDataInputStream *stream,
|
||||
* see g_data_stream_get_byte_order() and g_data_stream_set_byte_order().
|
||||
*
|
||||
* Returns: a signed 16-bit/2-byte value read from @stream or %0 if
|
||||
* an error occured.
|
||||
* an error occurred.
|
||||
**/
|
||||
gint16
|
||||
g_data_input_stream_read_int16 (GDataInputStream *stream,
|
||||
@ -403,7 +403,7 @@ g_data_input_stream_read_int16 (GDataInputStream *stream,
|
||||
* see g_data_stream_get_byte_order() and g_data_stream_set_byte_order().
|
||||
*
|
||||
* Returns: an unsigned 16-bit/2-byte value read from the @stream or %0 if
|
||||
* an error occured.
|
||||
* an error occurred.
|
||||
**/
|
||||
guint16
|
||||
g_data_input_stream_read_uint16 (GDataInputStream *stream,
|
||||
@ -451,7 +451,7 @@ g_data_input_stream_read_uint16 (GDataInputStream *stream,
|
||||
* was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
|
||||
*
|
||||
* Returns: a signed 32-bit/4-byte value read from the @stream or %0 if
|
||||
* an error occured.
|
||||
* an error occurred.
|
||||
**/
|
||||
gint32
|
||||
g_data_input_stream_read_int32 (GDataInputStream *stream,
|
||||
@ -499,7 +499,7 @@ g_data_input_stream_read_int32 (GDataInputStream *stream,
|
||||
* was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
|
||||
*
|
||||
* Returns: an unsigned 32-bit/4-byte value read from the @stream or %0 if
|
||||
* an error occured.
|
||||
* an error occurred.
|
||||
**/
|
||||
guint32
|
||||
g_data_input_stream_read_uint32 (GDataInputStream *stream,
|
||||
@ -547,7 +547,7 @@ g_data_input_stream_read_uint32 (GDataInputStream *stream,
|
||||
* was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
|
||||
*
|
||||
* Returns: a signed 64-bit/8-byte value read from @stream or %0 if
|
||||
* an error occured.
|
||||
* an error occurred.
|
||||
**/
|
||||
gint64
|
||||
g_data_input_stream_read_int64 (GDataInputStream *stream,
|
||||
@ -595,7 +595,7 @@ g_data_input_stream_read_int64 (GDataInputStream *stream,
|
||||
* was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
|
||||
*
|
||||
* Returns: an unsigned 64-bit/8-byte read from @stream or %0 if
|
||||
* an error occured.
|
||||
* an error occurred.
|
||||
**/
|
||||
guint64
|
||||
g_data_input_stream_read_uint64 (GDataInputStream *stream,
|
||||
|
14
gio/gfile.c
14
gio/gfile.c
@ -55,7 +55,7 @@
|
||||
* g_file_new_for_uri() if you have a URI.
|
||||
* g_file_new_for_commandline_arg() for a command line argument.
|
||||
*
|
||||
* You can move through the filesystem with #GFile handles with
|
||||
* You can move through the file system with #GFile handles with
|
||||
* g_file_get_parent() to get a handle to the parent directory.
|
||||
* g_file_get_child() to get a handle to a child within a directory.
|
||||
* g_file_resolve_relative_path() to resolve a relative path between
|
||||
@ -690,8 +690,8 @@ g_file_resolve_relative_path (GFile *file,
|
||||
* all the files in the directory.
|
||||
*
|
||||
* The @attribute value is a string that specifies the file attributes that
|
||||
* should be gathered. It is not an error if its not possible to read a particular
|
||||
* requested attribute from a file, it just won't be set. @attribute should
|
||||
* should be gathered. It is not an error if it's not possible to read a particular
|
||||
* requested attribute from a file - it just won't be set. @attribute should
|
||||
* be a comma-separated list of attribute or attribute wildcards. The wildcard "*"
|
||||
* means all attributes, and a wildcard like "standard::*" means all attributes in the standard
|
||||
* namespace. An example attribute query be "standard::*,owner::user".
|
||||
@ -873,8 +873,8 @@ g_file_query_exists (GFile *file,
|
||||
* for the file.
|
||||
*
|
||||
* The @attribute value is a string that specifies the file attributes that
|
||||
* should be gathered. It is not an error if its not possible to read a particular
|
||||
* requested attribute from a file, it just won't be set. @attribute should
|
||||
* should be gathered. It is not an error if it's not possible to read a particular
|
||||
* requested attribute from a file - it just won't be set. @attribute should
|
||||
* be a comma-separated list of attribute or attribute wildcards. The wildcard "*"
|
||||
* means all attributes, and a wildcard like "standard::*" means all attributes in the standard
|
||||
* namespace. An example attribute query be "standard::*,owner::user".
|
||||
@ -1012,8 +1012,8 @@ g_file_query_info_finish (GFile *file,
|
||||
* the filesystem.
|
||||
*
|
||||
* The @attribute value is a string that specifies the file attributes that
|
||||
* should be gathered. It is not an error if its not possible to read a particular
|
||||
* requested attribute from a file, it just won't be set. @attribute should
|
||||
* should be gathered. It is not an error if it's not possible to read a particular
|
||||
* requested attribute from a file - it just won't be set. @attribute should
|
||||
* be a comma-separated list of attribute or attribute wildcards. The wildcard "*"
|
||||
* means all attributes, and a wildcard like "fs:*" means all attributes in the fs
|
||||
* namespace. The standard namespace for filesystem attributes is "fs".
|
||||
|
@ -277,9 +277,9 @@ g_file_output_stream_query_info_finish (GFileOutputStream *stream,
|
||||
* g_file_output_stream_get_etag:
|
||||
* @stream: a #GFileOutputStream.
|
||||
*
|
||||
* Gets the entity tag for the file when its been written.
|
||||
* Gets the entity tag for the file when it has been written.
|
||||
* This must be called after the stream has been written
|
||||
* and closed. As the etag can change while writing.
|
||||
* and closed, as the etag can change while writing.
|
||||
*
|
||||
* Returns: the entity tag for the stream.
|
||||
**/
|
||||
|
@ -233,7 +233,7 @@ g_input_stream_read (GInputStream *stream,
|
||||
*
|
||||
* If there is an error during the operation %FALSE is returned and @error
|
||||
* is set to indicate the error status, @bytes_read is updated to contain
|
||||
* the number of bytes read into @buffer before the error occured.
|
||||
* the number of bytes read into @buffer before the error occurred.
|
||||
*
|
||||
* Return value: %TRUE on success, %FALSE if there was an error
|
||||
**/
|
||||
|
@ -44,7 +44,7 @@
|
||||
* porting from GnomeVFS, #GMount is the moral equivalent of #GnomeVFSVolume.
|
||||
*
|
||||
* #GMount is a "mounted" filesystem that you can access. Mounted is in
|
||||
* quotes because its not the same as a unix mount, it might be a gvfs
|
||||
* quotes because it's not the same as a unix mount, it might be a gvfs
|
||||
* mount, but you can still access the files on it if you use GIO. Might or
|
||||
* might not be related to a volume object.
|
||||
*
|
||||
@ -353,7 +353,7 @@ g_mount_unmount (GMount *mount,
|
||||
* @error: a #GError location to store the error occuring, or %NULL to
|
||||
* ignore.
|
||||
*
|
||||
* Finishes unmounting a mount. If any errors occured during the operation,
|
||||
* Finishes unmounting a mount. If any errors occurred during the operation,
|
||||
* @error will be set to contain the errors and %FALSE will be returned.
|
||||
*
|
||||
* Returns: %TRUE if the mount was successfully unmounted. %FALSE otherwise.
|
||||
@ -425,7 +425,7 @@ g_mount_eject (GMount *mount,
|
||||
* @error: a #GError location to store the error occuring, or %NULL to
|
||||
* ignore.
|
||||
*
|
||||
* Finishes ejecting a mount. If any errors occured during the operation,
|
||||
* Finishes ejecting a mount. If any errors occurred during the operation,
|
||||
* @error will be set to contain the errors and %FALSE will be returned.
|
||||
*
|
||||
* Returns: %TRUE if the mount was successfully ejected. %FALSE otherwise.
|
||||
@ -502,7 +502,7 @@ g_mount_remount (GMount *mount,
|
||||
* @error: a #GError location to store the error occuring, or %NULL to
|
||||
* ignore.
|
||||
*
|
||||
* Finishes remounting a mount. If any errors occured during the operation,
|
||||
* Finishes remounting a mount. If any errors occurred during the operation,
|
||||
* @error will be set to contain the errors and %FALSE will be returned.
|
||||
*
|
||||
* Returns: %TRUE if the mount was successfully remounted. %FALSE otherwise.
|
||||
|
@ -240,7 +240,7 @@ g_output_stream_write (GOutputStream *stream,
|
||||
*
|
||||
* If there is an error during the operation FALSE is returned and @error
|
||||
* is set to indicate the error status, @bytes_written is updated to contain
|
||||
* the number of bytes written into the stream before the error occured.
|
||||
* the number of bytes written into the stream before the error occurred.
|
||||
*
|
||||
* Return value: %TRUE on success, %FALSE if there was an error
|
||||
**/
|
||||
|
@ -132,7 +132,7 @@ g_seekable_can_seek (GSeekable *seekable)
|
||||
* was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
|
||||
*
|
||||
* Returns: %TRUE if successful. If an error
|
||||
* has occured, this function will return %FALSE and set @error
|
||||
* has occurred, this function will return %FALSE and set @error
|
||||
* appropriately if present.
|
||||
**/
|
||||
gboolean
|
||||
@ -188,7 +188,7 @@ g_seekable_can_truncate (GSeekable *seekable)
|
||||
* partial result will be returned, without an error.
|
||||
*
|
||||
* Returns: %TRUE if successful. If an error
|
||||
* has occured, this function will return %FALSE and set @error
|
||||
* has occurred, this function will return %FALSE and set @error
|
||||
* appropriately if present.
|
||||
**/
|
||||
gboolean
|
||||
|
@ -353,7 +353,7 @@ _g_get_unix_mounts ()
|
||||
*
|
||||
* We do this to avoid being fooled by --bind mounts, since
|
||||
* these have the same device as the location they bind to.
|
||||
* Its not an ideal solution to the problem, but its likely that
|
||||
* Its not an ideal solution to the problem, but it's likely that
|
||||
* the most important mountpoint is first and the --bind ones after
|
||||
* that aren't as important. So it should work.
|
||||
*
|
||||
|
Loading…
Reference in New Issue
Block a user