luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-09 19:06:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename g_mount_for_location to g_file_mount_enclosing_volume.

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/ChangeLog
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>
* gmountoperation.h:

30
gio/gfile.c
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.
* @mount_operation: a #GMountOperation.
* @cancellable: optional #GCancellable object, %NULL to ignore.
@ -3980,18 +3980,18 @@ g_file_new_for_commandline_arg (const char *arg)
*
* When this operation has completed, @callback will be called 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
* triggering the cancellable object from another thread. If the operation
* was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
**/
void
g_mount_for_location (GFile *location,
GMountOperation *mount_operation,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
g_file_mount_enclosing_volume (GFile *location,
GMountOperation *mount_operation,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
GFileIface *iface;
@ -4000,7 +4000,7 @@ g_mount_for_location (GFile *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),
callback, user_data,
@ -4010,26 +4010,26 @@ g_mount_for_location (GFile *location,
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.
* @result: a #GAsyncResult.
* @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
* has occured, this function will return %FALSE and set @error
* appropriately if present.
**/
gboolean
g_mount_for_location_finish (GFile *location,
GAsyncResult *result,
GError **error)
g_file_mount_enclosing_volume_finish (GFile *location,
GAsyncResult *result,
GError **error)
{
GFileIface *iface;
@ -4045,7 +4045,7 @@ g_mount_for_location_finish (GFile *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);
}
/********************************************

24
gio/gfile.h
View File

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

4
gio/gio.symbols
View File

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