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

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 6d98a0730b1cf22948b3629e25a623102e1ad31f..0e50b9b0d5c46b9b255e11cf47ee78ba00441b2f 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -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:

diff --git a/gio/gfile.c b/gio/gfile.c
index e1f3eefdc64f7a28579e1f2ca90680555dafabb6..abfdec860acdf1f8834aadfa72e185321bf4825f 100644 (file)
--- a/gio/gfile.c
+++ b/gio/gfile.c
@@ -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);
 }
 
 /********************************************

diff --git a/gio/gfile.h b/gio/gfile.h
index cf16027d04f4e8fa92df92c826029d41d15c9120..07d799274cd4186a3b36f4790902c614014d08b1 100644 (file)
--- a/gio/gfile.h
+++ b/gio/gfile.h
@@ -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,

diff --git a/gio/gio.symbols b/gio/gio.symbols
index d185ddba9ca03dbe4640c8084ca76cd1267b274a..bb405e9225ada2309dc67bf5aa1f4bc907be4512 100644 (file)
--- a/gio/gio.symbols
+++ b/gio/gio.symbols
@@ -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