X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgmount.c;h=5deb55bfbb6dc4a3512b8e8543263175a51b0a5a;hb=2a53b4d0e2c98a14aedf31e38f0ad1fb2e8fe26f;hp=685d86251d950be86a7260723ddc0c36709f98de;hpb=835f9cb310b988b07d1822c3f12093b9b01bc496;p=platform%2Fupstream%2Fglib.git diff --git a/gio/gmount.c b/gio/gmount.c index 685d862..5deb55b 100644 --- a/gio/gmount.c +++ b/gio/gmount.c @@ -15,9 +15,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library; if not, see . * * Author: Alexander Larsson * David Zeuthen @@ -29,8 +27,9 @@ #include "gmount.h" #include "gmountprivate.h" +#include "gthemedicon.h" #include "gasyncresult.h" -#include "gsimpleasyncresult.h" +#include "gtask.h" #include "gioerror.h" #include "glibintl.h" @@ -39,7 +38,7 @@ * SECTION:gmount * @short_description: Mount management * @include: gio/gio.h - * @see also: GVolume, GUnixMount + * @see_also: GVolume, GUnixMountEntry, GUnixMountPoint * * The #GMount interface represents user-visible mounts. Note, when * porting from GnomeVFS, #GMount is the moral equivalent of #GnomeVFSVolume. @@ -50,8 +49,8 @@ * might not be related to a volume object. * * Unmounting a #GMount instance is an asynchronous operation. For - * more information about asynchronous operations, see #GAsyncReady - * and #GSimpleAsyncReady. To unmount a #GMount instance, first call + * more information about asynchronous operations, see #GAsyncResult + * and #GTask. To unmount a #GMount instance, first call * g_mount_unmount_with_operation() with (at least) the #GMount instance and a * #GAsyncReadyCallback. The callback will be fired when the * operation has resolved (either with success or failure), and a @@ -146,7 +145,7 @@ g_mount_get_root (GMount *mount) * @mount is a path that reflects the main entry point for the user (e.g. * the home directory, or the root of the volume). * - * Returns: a #GFile. + * Returns: (transfer full): a #GFile. * The returned object should be unreffed with * g_object_unref() when no longer needed. **/ @@ -213,6 +212,37 @@ g_mount_get_icon (GMount *mount) return (* iface->get_icon) (mount); } + +/** + * g_mount_get_symbolic_icon: + * @mount: a #GMount. + * + * Gets the symbolic icon for @mount. + * + * Returns: (transfer full): a #GIcon. + * The returned object should be unreffed with + * g_object_unref() when no longer needed. + * + * Since: 2.34 + **/ +GIcon * +g_mount_get_symbolic_icon (GMount *mount) +{ + GMountIface *iface; + GIcon *ret; + + g_return_val_if_fail (G_IS_MOUNT (mount), NULL); + + iface = G_MOUNT_GET_IFACE (mount); + + if (iface->get_symbolic_icon != NULL) + ret = iface->get_symbolic_icon (mount); + else + ret = g_themed_icon_new_with_default_fallbacks ("folder-remote-symbolic"); + + return ret; +} + /** * g_mount_get_uuid: * @mount: a #GMount. @@ -329,8 +359,8 @@ g_mount_can_eject (GMount *mount) * g_mount_unmount: * @mount: a #GMount. * @flags: flags affecting the operation - * @cancellable: optional #GCancellable object, %NULL to ignore. - * @callback: a #GAsyncReadyCallback, or %NULL. + * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL. * @user_data: user data passed to @callback. * * Unmounts a mount. This is an asynchronous operation, and is @@ -354,14 +384,13 @@ g_mount_unmount (GMount *mount, if (iface->unmount == NULL) { - g_simple_async_report_error_in_idle (G_OBJECT (mount), - callback, user_data, - G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, - /* Translators: This is an error - * message for mount objects that - * don't implement unmount. */ - _("mount doesn't implement \"unmount\"")); - + g_task_report_new_error (mount, callback, user_data, + g_mount_unmount_with_operation, + G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, + /* Translators: This is an error + * message for mount objects that + * don't implement unmount. */ + _("mount doesn't implement \"unmount\"")); return; } @@ -372,7 +401,7 @@ g_mount_unmount (GMount *mount, * g_mount_unmount_finish: * @mount: a #GMount. * @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 unmounting a mount. If any errors occurred during the operation, @@ -392,12 +421,10 @@ g_mount_unmount_finish (GMount *mount, g_return_val_if_fail (G_IS_MOUNT (mount), FALSE); g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE); - if (G_IS_SIMPLE_ASYNC_RESULT (result)) - { - GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - } + if (g_async_result_legacy_propagate_error (result, error)) + return FALSE; + else if (g_async_result_is_tagged (result, g_mount_unmount_with_operation)) + return g_task_propagate_boolean (G_TASK (result), error); iface = G_MOUNT_GET_IFACE (mount); return (* iface->unmount_finish) (mount, result, error); @@ -408,8 +435,8 @@ g_mount_unmount_finish (GMount *mount, * g_mount_eject: * @mount: a #GMount. * @flags: flags affecting the unmount if required for eject - * @cancellable: optional #GCancellable object, %NULL to ignore. - * @callback: a #GAsyncReadyCallback, or %NULL. + * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL. * @user_data: user data passed to @callback. * * Ejects a mount. This is an asynchronous operation, and is @@ -433,14 +460,13 @@ g_mount_eject (GMount *mount, if (iface->eject == NULL) { - g_simple_async_report_error_in_idle (G_OBJECT (mount), - callback, user_data, - G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, - /* Translators: This is an error - * message for mount objects that - * don't implement eject. */ - _("mount doesn't implement \"eject\"")); - + g_task_report_new_error (mount, callback, user_data, + g_mount_eject_with_operation, + G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, + /* Translators: This is an error + * message for mount objects that + * don't implement eject. */ + _("mount doesn't implement \"eject\"")); return; } @@ -451,7 +477,7 @@ g_mount_eject (GMount *mount, * g_mount_eject_finish: * @mount: a #GMount. * @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 mount. If any errors occurred during the operation, @@ -471,12 +497,10 @@ g_mount_eject_finish (GMount *mount, g_return_val_if_fail (G_IS_MOUNT (mount), FALSE); g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE); - if (G_IS_SIMPLE_ASYNC_RESULT (result)) - { - GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - } + if (g_async_result_legacy_propagate_error (result, error)) + return FALSE; + else if (g_async_result_is_tagged (result, g_mount_eject_with_operation)) + return g_task_propagate_boolean (G_TASK (result), error); iface = G_MOUNT_GET_IFACE (mount); return (* iface->eject_finish) (mount, result, error); @@ -486,9 +510,10 @@ g_mount_eject_finish (GMount *mount, * g_mount_unmount_with_operation: * @mount: a #GMount. * @flags: flags affecting the operation - * @mount_operation: a #GMountOperation or %NULL to avoid user interaction. - * @cancellable: optional #GCancellable object, %NULL to ignore. - * @callback: a #GAsyncReadyCallback, or %NULL. + * @mount_operation: (allow-none): a #GMountOperation or %NULL to avoid + * user interaction. + * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL. * @user_data: user data passed to @callback. * * Unmounts a mount. This is an asynchronous operation, and is @@ -513,14 +538,13 @@ g_mount_unmount_with_operation (GMount *mount, if (iface->unmount == NULL && iface->unmount_with_operation == NULL) { - g_simple_async_report_error_in_idle (G_OBJECT (mount), - callback, user_data, - G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, - /* Translators: This is an error - * message for mount objects that - * don't implement any of unmount or unmount_with_operation. */ - _("mount doesn't implement \"unmount\" or \"unmount_with_operation\"")); - + g_task_report_new_error (mount, callback, user_data, + g_mount_unmount_with_operation, + G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, + /* Translators: This is an error + * message for mount objects that + * don't implement any of unmount or unmount_with_operation. */ + _("mount doesn't implement \"unmount\" or \"unmount_with_operation\"")); return; } @@ -534,7 +558,7 @@ g_mount_unmount_with_operation (GMount *mount, * g_mount_unmount_with_operation_finish: * @mount: a #GMount. * @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 unmounting a mount. If any errors occurred during the operation, @@ -554,12 +578,10 @@ g_mount_unmount_with_operation_finish (GMount *mount, g_return_val_if_fail (G_IS_MOUNT (mount), FALSE); g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE); - if (G_IS_SIMPLE_ASYNC_RESULT (result)) - { - GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - } + if (g_async_result_legacy_propagate_error (result, error)) + return FALSE; + else if (g_async_result_is_tagged (result, g_mount_unmount_with_operation)) + return g_task_propagate_boolean (G_TASK (result), error); iface = G_MOUNT_GET_IFACE (mount); if (iface->unmount_with_operation_finish != NULL) @@ -573,9 +595,10 @@ g_mount_unmount_with_operation_finish (GMount *mount, * g_mount_eject_with_operation: * @mount: a #GMount. * @flags: flags affecting the unmount if required for eject - * @mount_operation: a #GMountOperation or %NULL to avoid user interaction. - * @cancellable: optional #GCancellable object, %NULL to ignore. - * @callback: a #GAsyncReadyCallback, or %NULL. + * @mount_operation: (allow-none): a #GMountOperation or %NULL to avoid + * user interaction. + * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL. * @user_data: user data passed to @callback. * * Ejects a mount. This is an asynchronous operation, and is @@ -600,13 +623,13 @@ g_mount_eject_with_operation (GMount *mount, if (iface->eject == NULL && iface->eject_with_operation == NULL) { - g_simple_async_report_error_in_idle (G_OBJECT (mount), - callback, user_data, - G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, - /* Translators: This is an error - * message for mount objects that - * don't implement any of eject or eject_with_operation. */ - _("mount doesn't implement \"eject\" or \"eject_with_operation\"")); + g_task_report_new_error (mount, callback, user_data, + g_mount_eject_with_operation, + G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, + /* Translators: This is an error + * message for mount objects that + * don't implement any of eject or eject_with_operation. */ + _("mount doesn't implement \"eject\" or \"eject_with_operation\"")); return; } @@ -620,7 +643,7 @@ g_mount_eject_with_operation (GMount *mount, * g_mount_eject_with_operation_finish: * @mount: a #GMount. * @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 mount. If any errors occurred during the operation, @@ -640,12 +663,10 @@ g_mount_eject_with_operation_finish (GMount *mount, g_return_val_if_fail (G_IS_MOUNT (mount), FALSE); g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE); - if (G_IS_SIMPLE_ASYNC_RESULT (result)) - { - GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - } + if (g_async_result_legacy_propagate_error (result, error)) + return FALSE; + else if (g_async_result_is_tagged (result, g_mount_eject_with_operation)) + return g_task_propagate_boolean (G_TASK (result), error); iface = G_MOUNT_GET_IFACE (mount); if (iface->eject_with_operation_finish != NULL) @@ -658,9 +679,10 @@ g_mount_eject_with_operation_finish (GMount *mount, * g_mount_remount: * @mount: a #GMount. * @flags: flags affecting the operation - * @mount_operation: a #GMountOperation or %NULL to avoid user interaction. - * @cancellable: optional #GCancellable object, %NULL to ignore. - * @callback: a #GAsyncReadyCallback, or %NULL. + * @mount_operation: (allow-none): a #GMountOperation or %NULL to avoid + * user interaction. + * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @callback: (allow-none): a #GAsyncReadyCallback, or %NULL. * @user_data: user data passed to @callback. * * Remounts a mount. This is an asynchronous operation, and is @@ -689,14 +711,13 @@ g_mount_remount (GMount *mount, if (iface->remount == NULL) { - g_simple_async_report_error_in_idle (G_OBJECT (mount), - callback, user_data, - G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, - /* Translators: This is an error - * message for mount objects that - * don't implement remount. */ - _("mount doesn't implement \"remount\"")); - + g_task_report_new_error (mount, callback, user_data, + g_mount_remount, + G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, + /* Translators: This is an error + * message for mount objects that + * don't implement remount. */ + _("mount doesn't implement \"remount\"")); return; } @@ -707,7 +728,7 @@ g_mount_remount (GMount *mount, * g_mount_remount_finish: * @mount: a #GMount. * @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 remounting a mount. If any errors occurred during the operation, @@ -725,12 +746,10 @@ g_mount_remount_finish (GMount *mount, g_return_val_if_fail (G_IS_MOUNT (mount), FALSE); g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE); - if (G_IS_SIMPLE_ASYNC_RESULT (result)) - { - GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result); - if (g_simple_async_result_propagate_error (simple, error)) - return FALSE; - } + if (g_async_result_legacy_propagate_error (result, error)) + return FALSE; + else if (g_async_result_is_tagged (result, g_mount_remount)) + return g_task_propagate_boolean (G_TASK (result), error); iface = G_MOUNT_GET_IFACE (mount); return (* iface->remount_finish) (mount, result, error); @@ -741,14 +760,15 @@ g_mount_remount_finish (GMount *mount, * @mount: a #GMount * @force_rescan: Whether to force a rescan of the content. * Otherwise a cached result will be used if available - * @cancellable: optional #GCancellable object, %NULL to ignore + * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore * @callback: a #GAsyncReadyCallback * @user_data: user data passed to @callback * * Tries to guess the type of content stored on @mount. Returns one or * more textual identifiers of well-known content types (typically * prefixed with "x-content/"), e.g. x-content/image-dcf for camera - * memory cards. See the shared-mime-info + * memory cards. See the + * [shared-mime-info](http://www.freedesktop.org/wiki/Specifications/shared-mime-info-spec) * specification for more on x-content types. * * This is an asynchronous operation (see @@ -773,14 +793,13 @@ g_mount_guess_content_type (GMount *mount, if (iface->guess_content_type == NULL) { - g_simple_async_report_error_in_idle (G_OBJECT (mount), - callback, user_data, - G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, - /* Translators: This is an error - * message for mount objects that - * don't implement content type guessing. */ - _("mount doesn't implement content type guessing")); - + g_task_report_new_error (mount, callback, user_data, + g_mount_guess_content_type, + G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED, + /* Translators: This is an error + * message for mount objects that + * don't implement content type guessing. */ + _("mount doesn't implement content type guessing")); return; } @@ -791,16 +810,16 @@ g_mount_guess_content_type (GMount *mount, * g_mount_guess_content_type_finish: * @mount: a #GMount * @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 guessing content types of @mount. If any errors occured + * Finishes guessing content types of @mount. If any errors occurred * during the operation, @error will be set to contain the errors and * %FALSE will be returned. In particular, you may get an * %G_IO_ERROR_NOT_SUPPORTED if the mount does not support content * guessing. * - * Returns: a %NULL-terminated array of content types or %NULL on error. + * Returns: (transfer full) (element-type utf8): a %NULL-terminated array of content types or %NULL on error. * Caller should free this array with g_strfreev() when done with it. * * Since: 2.18 @@ -815,12 +834,10 @@ g_mount_guess_content_type_finish (GMount *mount, g_return_val_if_fail (G_IS_MOUNT (mount), NULL); g_return_val_if_fail (G_IS_ASYNC_RESULT (result), NULL); - if (G_IS_SIMPLE_ASYNC_RESULT (result)) - { - GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result); - if (g_simple_async_result_propagate_error (simple, error)) - return NULL; - } + if (g_async_result_legacy_propagate_error (result, error)) + return NULL; + else if (g_async_result_is_tagged (result, g_mount_guess_content_type)) + return g_task_propagate_pointer (G_TASK (result), error); iface = G_MOUNT_GET_IFACE (mount); return (* iface->guess_content_type_finish) (mount, result, error); @@ -831,20 +848,21 @@ g_mount_guess_content_type_finish (GMount *mount, * @mount: a #GMount * @force_rescan: Whether to force a rescan of the content. * Otherwise a cached result will be used if available - * @cancellable: optional #GCancellable object, %NULL to ignore - * @error: a #GError location to store the error occuring, or %NULL to + * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore + * @error: a #GError location to store the error occurring, or %NULL to * ignore * * Tries to guess the type of content stored on @mount. Returns one or * more textual identifiers of well-known content types (typically * prefixed with "x-content/"), e.g. x-content/image-dcf for camera - * memory cards. See the shared-mime-info + * memory cards. See the + * [shared-mime-info](http://www.freedesktop.org/wiki/Specifications/shared-mime-info-spec) * specification for more on x-content types. * * This is an synchronous operation and as such may block doing IO; * see g_mount_guess_content_type() for the asynchronous version. * - * Returns: a %NULL-terminated array of content types or %NULL on error. + * Returns: (transfer full) (element-type utf8): a %NULL-terminated array of content types or %NULL on error. * Caller should free this array with g_strfreev() when done with it. * * Since: 2.18 @@ -928,10 +946,10 @@ get_private (GMount *mount) * situation, a #GVolumeMonitor implementation would create two * #GVolume objects (for example, one for the camera functionality of * the device and one for a SD card reader on the device) with - * activation URIs gphoto2://[usb:001,002]/store1/ - * and gphoto2://[usb:001,002]/store2/. When the + * activation URIs `gphoto2://[usb:001,002]/store1/` + * and `gphoto2://[usb:001,002]/store2/`. When the * underlying mount (with root - * gphoto2://[usb:001,002]/) is mounted, said + * `gphoto2://[usb:001,002]/`) is mounted, said * #GVolumeMonitor implementation would create two #GMount objects * (each with their root matching the corresponding volume activation * root) that would shadow the original mount. @@ -1009,3 +1027,28 @@ g_mount_unshadow (GMount *mount) g_warning ("Shadow ref count on GMount is negative"); G_UNLOCK (priv_lock); } + +/** + * g_mount_get_sort_key: + * @mount: A #GMount. + * + * Gets the sort key for @mount, if any. + * + * Returns: Sorting key for @mount or %NULL if no such key is available. + * + * Since: 2.32 + */ +const gchar * +g_mount_get_sort_key (GMount *mount) +{ + const gchar *ret = NULL; + GMountIface *iface; + + g_return_val_if_fail (G_IS_MOUNT (mount), NULL); + + iface = G_MOUNT_GET_IFACE (mount); + if (iface->get_sort_key != NULL) + ret = iface->get_sort_key (mount); + + return ret; +}