Commit 1da859f0 authored by Alexander Larsson's avatar Alexander Larsson Committed by Alexander Larsson

Update for g_mount_for_location to g_file_mount_enclosing_volume change.

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

        * libnautilus-private/nautilus-mime-actions.c:
        * src/nautilus-window-manage-views.c:
	Update for g_mount_for_location to g_file_mount_enclosing_volume change.


svn path=/trunk/; revision=13527
parent 9e0881ae
2007-12-13 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-mime-actions.c:
* src/nautilus-window-manage-views.c:
Update for g_mount_for_location to g_file_mount_enclosing_volume change.
2007-12-12 Alexander Larsson <alexl@redhat.com>
* src/file-manager/fm-directory-view.c:
......
......@@ -1223,7 +1223,7 @@ activation_mount_not_mounted_callback (GObject *source_object,
file = parameters->not_mounted->data;
error = NULL;
if (!g_mount_for_location_finish (G_FILE (source_object), res, &error)) {
if (!g_file_mount_enclosing_volume_finish (G_FILE (source_object), res, &error)) {
if (error->domain != G_IO_ERROR &&
error->code != G_IO_ERROR_CANCELLED &&
error->code != G_IO_ERROR_ALREADY_MOUNTED) {
......@@ -1259,8 +1259,8 @@ activation_mount_not_mounted (ActivateParameters *parameters)
mount_op = eel_mount_operation_new (parameters->parent_window);
g_signal_connect (mount_op, "active_changed", (GCallback)activate_mount_op_active, parameters);
location = nautilus_file_get_location (file);
g_mount_for_location (location, mount_op, parameters->cancellable,
activation_mount_not_mounted_callback, parameters);
g_file_mount_enclosing_volume (location, mount_op, parameters->cancellable,
activation_mount_not_mounted_callback, parameters);
g_object_unref (location);
g_object_unref (mount_op);
return;
......
......@@ -914,7 +914,7 @@ mount_not_mounted_callback (GObject *source_object,
window->details->determine_view_file = nautilus_file_get (window->details->pending_location);
error = NULL;
if (!g_mount_for_location_finish (G_FILE (source_object), res, &error)) {
if (!g_file_mount_enclosing_volume_finish (G_FILE (source_object), res, &error)) {
window->details->mount_error = error;
got_file_info_for_view_selection_callback (window->details->determine_view_file, window);
window->details->mount_error = NULL;
......@@ -965,8 +965,8 @@ got_file_info_for_view_selection_callback (NautilusFile *file,
data->cancellable = g_cancellable_new ();
data->window = window;
window->details->mount_cancellable = data->cancellable;
g_mount_for_location (location, mount_op, window->details->mount_cancellable,
mount_not_mounted_callback, data);
g_file_mount_enclosing_volume (location, mount_op, window->details->mount_cancellable,
mount_not_mounted_callback, data);
g_object_unref (location);
g_object_unref (mount_op);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment