Rename g_mount_for_location to g_file_mount_enclosing_volume.

2007-12-13  Alexander Larsson  <alexl@redhat.com>

        * gfile.[ch]:
        * gio.symbols:
	Rename g_mount_for_location to g_file_mount_enclosing_volume.


svn path=/trunk/; revision=6114
This commit is contained in:
Alexander Larsson 2007-12-13 16:22:43 +00:00 committed by Alexander Larsson
parent 69f071c88b
commit f6b9b4f45e
4 changed files with 35 additions and 29 deletions

View File

@ -1,3 +1,9 @@
2007-12-13 Alexander Larsson <alexl@redhat.com>
* gfile.[ch]:
* gio.symbols:
Rename g_mount_for_location to g_file_mount_enclosing_volume.
2007-12-13 Alexander Larsson <alexl@redhat.com> 2007-12-13 Alexander Larsson <alexl@redhat.com>
* gmountoperation.h: * gmountoperation.h:

View File

@ -3969,7 +3969,7 @@ g_file_new_for_commandline_arg (const char *arg)
} }
/** /**
* g_mount_for_location: * g_file_mount_enclosing_volume:
* @location: input #GFile. * @location: input #GFile.
* @mount_operation: a #GMountOperation. * @mount_operation: a #GMountOperation.
* @cancellable: optional #GCancellable object, %NULL to ignore. * @cancellable: optional #GCancellable object, %NULL to ignore.
@ -3980,14 +3980,14 @@ g_file_new_for_commandline_arg (const char *arg)
* *
* When this operation has completed, @callback will be called with * When this operation has completed, @callback will be called with
* @user_user data, and the operation can be finalized with * @user_user data, and the operation can be finalized with
* g_mount_for_location_finish(). * g_file_mount_enclosing_volume_finish().
* *
* If @cancellable is not %NULL, then the operation can be cancelled by * If @cancellable is not %NULL, then the operation can be cancelled by
* triggering the cancellable object from another thread. If the operation * triggering the cancellable object from another thread. If the operation
* was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
**/ **/
void void
g_mount_for_location (GFile *location, g_file_mount_enclosing_volume (GFile *location,
GMountOperation *mount_operation, GMountOperation *mount_operation,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
@ -4000,7 +4000,7 @@ g_mount_for_location (GFile *location,
iface = G_FILE_GET_IFACE (location); iface = G_FILE_GET_IFACE (location);
if (iface->mount_for_location == NULL) if (iface->mount_enclosing_volume == NULL)
{ {
g_simple_async_report_error_in_idle (G_OBJECT (location), g_simple_async_report_error_in_idle (G_OBJECT (location),
callback, user_data, callback, user_data,
@ -4010,24 +4010,24 @@ g_mount_for_location (GFile *location,
return; return;
} }
(* iface->mount_for_location) (location, mount_operation, cancellable, callback, user_data); (* iface->mount_enclosing_volume) (location, mount_operation, cancellable, callback, user_data);
} }
/** /**
* g_mount_for_location_finish: * g_file_mount_enclosing_volume_finish:
* @location: input #GFile. * @location: input #GFile.
* @result: a #GAsyncResult. * @result: a #GAsyncResult.
* @error: a #GError, or %NULL * @error: a #GError, or %NULL
* *
* Finishes a mount operation started by g_mount_for_location(). * Finishes a mount operation started by g_file_mount_enclosing_volume().
* *
* Returns: %TRUE if successful. If an error * Returns: %TRUE if successful. If an error
* has occured, this function will return %FALSE and set @error * has occured, this function will return %FALSE and set @error
* appropriately if present. * appropriately if present.
**/ **/
gboolean gboolean
g_mount_for_location_finish (GFile *location, g_file_mount_enclosing_volume_finish (GFile *location,
GAsyncResult *result, GAsyncResult *result,
GError **error) GError **error)
{ {
@ -4045,7 +4045,7 @@ g_mount_for_location_finish (GFile *location,
iface = G_FILE_GET_IFACE (location); iface = G_FILE_GET_IFACE (location);
return (* iface->mount_for_location_finish) (location, result, error); return (* iface->mount_enclosing_volume_finish) (location, result, error);
} }
/******************************************** /********************************************

View File

@ -222,8 +222,8 @@ typedef gboolean (* GFileReadMoreCallback) (const char *file_contents,
* @unmount_mountable_finish: Finishes an unmount operation. * @unmount_mountable_finish: Finishes an unmount operation.
* @eject_mountable: Ejects a mountable. * @eject_mountable: Ejects a mountable.
* @eject_mountable_finish: Finishes an eject operation. * @eject_mountable_finish: Finishes an eject operation.
* @mount_for_location: Mounts a specified location. * @g_file_mount_enclosing_volume: Mounts a specified location.
* @mount_for_location_finish: Finishes mounting a specified location. * @g_file_mount_enclosing_volume_finish: Finishes mounting a specified location.
* @monitor_dir: Creates a #GDirectoryMonitor for the location. * @monitor_dir: Creates a #GDirectoryMonitor for the location.
* @monitor_file: Creates a #GFileMonitor for the location. * @monitor_file: Creates a #GFileMonitor for the location.
* *
@ -487,12 +487,12 @@ struct _GFileIface
GError **error); GError **error);
void (*mount_for_location) (GFile *location, void (*mount_enclosing_volume) (GFile *location,
GMountOperation *mount_operation, GMountOperation *mount_operation,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
gboolean (*mount_for_location_finish) (GFile *location, gboolean (*mount_enclosing_volume_finish) (GFile *location,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
@ -731,12 +731,12 @@ gboolean g_file_set_attribute_int64 (GFile
GFileQueryInfoFlags flags, GFileQueryInfoFlags flags,
GCancellable *cancellable, GCancellable *cancellable,
GError **error); GError **error);
void g_mount_for_location (GFile *location, void g_file_mount_enclosing_volume (GFile *location,
GMountOperation *mount_operation, GMountOperation *mount_operation,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
gboolean g_mount_for_location_finish (GFile *location, gboolean g_file_mount_enclosing_volume_finish (GFile *location,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
void g_file_mount_mountable (GFile *file, void g_file_mount_mountable (GFile *file,

View File

@ -299,8 +299,8 @@ g_file_set_attribute_uint32
g_file_set_attribute_int32 g_file_set_attribute_int32
g_file_set_attribute_uint64 g_file_set_attribute_uint64
g_file_set_attribute_int64 g_file_set_attribute_int64
g_mount_for_location g_file_mount_enclosing_volume
g_mount_for_location_finish g_file_mount_enclosing_volume_finish
g_file_mount_mountable g_file_mount_mountable
g_file_mount_mountable_finish g_file_mount_mountable_finish
g_file_unmount_mountable g_file_unmount_mountable