Commit 0082cd73 authored by Alexander Larsson's avatar Alexander Larsson Committed by Alexander Larsson

Update for new gio mount flags argument

2008-02-11  Alexander Larsson  <alexl@redhat.com>

        * libnautilus-private/nautilus-file-operations.c:
        * libnautilus-private/nautilus-mime-actions.c:
        * libnautilus-private/nautilus-vfs-file.c:
        * src/nautilus-application.c:
        * src/nautilus-window-manage-views.c:
	Update for new gio mount flags argument


svn path=/trunk/; revision=13724
parent b1a0d1a2
2008-02-11 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-file-operations.c:
* libnautilus-private/nautilus-mime-actions.c:
* libnautilus-private/nautilus-vfs-file.c:
* src/nautilus-application.c:
* src/nautilus-window-manage-views.c:
Update for new gio mount flags argument
2008-02-11 Alexander Larsson <alexl@redhat.com>
* src/nautilus-places-sidebar.c (update_places):
......
......@@ -2022,7 +2022,7 @@ nautilus_file_operations_mount_volume (GtkWindow *parent_window,
mount_op = eel_mount_operation_new (parent_window);
nautilus_inhibit_autorun_for_volume (volume);
g_volume_mount (volume, mount_op, NULL, volume_mount_cb, mount_op);
g_volume_mount (volume, 0, mount_op, NULL, volume_mount_cb, mount_op);
}
......
......@@ -1300,7 +1300,7 @@ activation_mount_not_mounted (ActivateParameters *parameters)
g_signal_connect (mount_op, "active_changed", (GCallback)activate_mount_op_active, parameters);
location = nautilus_file_get_location (file);
nautilus_inhibit_autorun_for_file (location);
g_file_mount_enclosing_volume (location, mount_op, parameters->cancellable,
g_file_mount_enclosing_volume (location, 0, mount_op, parameters->cancellable,
activation_mount_not_mounted_callback, parameters);
g_object_unref (location);
g_object_unref (mount_op);
......
......@@ -278,6 +278,7 @@ vfs_file_mount (NautilusFile *file,
location = nautilus_file_get_location (file);
g_file_mount_mountable (location,
0,
mount_op,
op->cancellable,
vfs_file_mount_callback,
......
......@@ -209,7 +209,7 @@ automount_all_volumes (NautilusApplication *application)
nautilus_inhibit_autorun_for_volume (volume);
/* pass NULL as GMountOperation to avoid user interaction */
g_volume_mount (volume, NULL, NULL, startup_volume_mount_cb, NULL);
g_volume_mount (volume, 0, NULL, NULL, startup_volume_mount_cb, NULL);
}
eel_g_object_list_free (volumes);
}
......
......@@ -969,7 +969,7 @@ got_file_info_for_view_selection_callback (NautilusFile *file,
data->window = window;
window->details->mount_cancellable = data->cancellable;
nautilus_inhibit_autorun_for_file (location);
g_file_mount_enclosing_volume (location, mount_op, window->details->mount_cancellable,
g_file_mount_enclosing_volume (location, 0, 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