diff options
| author | Alexander Larsson <alexl@redhat.com> | 2008-02-11 11:15:26 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2008-02-11 11:15:26 +0000 |
| commit | 0082cd73dbcf6c277f14f9c065adc6f57d78ed0d (patch) | |
| tree | 967216f6c28fdc8843b1114fe266a1b476a1e9a0 | |
| parent | b1a0d1a2ed3564252a48a2b6c7b2e069277a0818 (diff) | |
| download | nautilus-0082cd73dbcf6c277f14f9c065adc6f57d78ed0d.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-file-operations.c | 2 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-mime-actions.c | 2 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-vfs-file.c | 1 | ||||
| -rw-r--r-- | src/nautilus-application.c | 2 | ||||
| -rw-r--r-- | src/nautilus-window-manage-views.c | 2 |
6 files changed, 14 insertions, 4 deletions
@@ -1,5 +1,14 @@ 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): Fix leak of volumes list. Pointed out by Vincent Untz diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index 231522b79..40d5d14b4 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -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); } diff --git a/libnautilus-private/nautilus-mime-actions.c b/libnautilus-private/nautilus-mime-actions.c index 3d18107f0..e453761df 100644 --- a/libnautilus-private/nautilus-mime-actions.c +++ b/libnautilus-private/nautilus-mime-actions.c @@ -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); diff --git a/libnautilus-private/nautilus-vfs-file.c b/libnautilus-private/nautilus-vfs-file.c index 6132efd5f..37058e5d0 100644 --- a/libnautilus-private/nautilus-vfs-file.c +++ b/libnautilus-private/nautilus-vfs-file.c @@ -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, diff --git a/src/nautilus-application.c b/src/nautilus-application.c index c1d85344f..41aade720 100644 --- a/src/nautilus-application.c +++ b/src/nautilus-application.c @@ -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); } diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c index 9288299d0..613feb030 100644 --- a/src/nautilus-window-manage-views.c +++ b/src/nautilus-window-manage-views.c @@ -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); |