diff options
| author | Alexander Larsson <alexl@redhat.com> | 2008-02-11 11:14:35 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2008-02-11 11:14:35 +0000 |
| commit | f3b6acbb7c64aa4fea25b1adf15495d5983531f1 (patch) | |
| tree | dbbfb7e02cbde08ac06c63687de1842f90828e3a | |
| parent | 4583651013904c070a03410997d4ddc3544bf63a (diff) | |
| download | gvfs-f3b6acbb7c64aa4fea25b1adf15495d5983531f1.tar.gz | |
Update for the new mount flag argument.
2008-02-11 Alexander Larsson <alexl@redhat.com>
* client/gdaemonfile.c:
* daemon/gvfsbackendcomputer.c:
* hal/ghalvolume.c:
* programs/gvfs-mount.c:
Update for the new mount flag argument.
* hal/ghaldrive.c:
* programs/gvfs-open.c:
Fix warnings
svn path=/trunk/; revision=1253
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | client/gdaemonfile.c | 4 | ||||
| -rw-r--r-- | daemon/gvfsbackendcomputer.c | 1 | ||||
| -rw-r--r-- | hal/ghaldrive.c | 2 | ||||
| -rw-r--r-- | hal/ghalvolume.c | 6 | ||||
| -rw-r--r-- | programs/gvfs-mount.c | 4 | ||||
| -rw-r--r-- | programs/gvfs-open.c | 7 |
7 files changed, 24 insertions, 12 deletions
@@ -1,3 +1,15 @@ +2008-02-11 Alexander Larsson <alexl@redhat.com> + + * client/gdaemonfile.c: + * daemon/gvfsbackendcomputer.c: + * hal/ghalvolume.c: + * programs/gvfs-mount.c: + Update for the new mount flag argument. + + * hal/ghaldrive.c: + * programs/gvfs-open.c: + Fix warnings + 2008-02-10 Luca Ferretti <elle.uca@libero.it> * daemon/gvfsbackendburn.c: (g_vfs_backend_burn_init), diff --git a/client/gdaemonfile.c b/client/gdaemonfile.c index b5f99bf3..4c3d2228 100644 --- a/client/gdaemonfile.c +++ b/client/gdaemonfile.c @@ -1223,6 +1223,7 @@ mount_mountable_async_cb (DBusMessage *reply, if (must_mount_location) { g_file_mount_enclosing_volume (file, + 0, mount_operation, cancellable, mount_mountable_location_mounted_cb, @@ -1235,6 +1236,7 @@ mount_mountable_async_cb (DBusMessage *reply, static void g_daemon_file_mount_mountable (GFile *file, + GMountMountFlags flags, GMountOperation *mount_operation, GCancellable *cancellable, GAsyncReadyCallback callback, @@ -1364,6 +1366,7 @@ typedef struct { } MountData; static void g_daemon_file_mount_enclosing_volume (GFile *location, + GMountMountFlags flags, GMountOperation *mount_operation, GCancellable *cancellable, GAsyncReadyCallback callback, @@ -1402,6 +1405,7 @@ mount_reply (DBusMessage *reply, static void g_daemon_file_mount_enclosing_volume (GFile *location, + GMountMountFlags flags, GMountOperation *mount_operation, GCancellable *cancellable, GAsyncReadyCallback callback, diff --git a/daemon/gvfsbackendcomputer.c b/daemon/gvfsbackendcomputer.c index ce4801eb..b31a9bc6 100644 --- a/daemon/gvfsbackendcomputer.c +++ b/daemon/gvfsbackendcomputer.c @@ -802,6 +802,7 @@ try_mount_mountable (GVfsBackend *backend, { mount_op = g_mount_source_get_operation (mount_source); g_volume_mount (file->volume, + 0, mount_op, G_VFS_JOB (job)->cancellable, mount_volume_cb, diff --git a/hal/ghaldrive.c b/hal/ghaldrive.c index 74a02f14..f0926b8a 100644 --- a/hal/ghaldrive.c +++ b/hal/ghaldrive.c @@ -877,7 +877,7 @@ g_hal_drive_enumerate_identifiers (GDrive *drive) /* Null-terminate */ g_ptr_array_add (res, NULL); - return g_ptr_array_free (res, FALSE); + return (char **)g_ptr_array_free (res, FALSE); } static void diff --git a/hal/ghalvolume.c b/hal/ghalvolume.c index 8168ddca..4553d1db 100644 --- a/hal/ghalvolume.c +++ b/hal/ghalvolume.c @@ -818,6 +818,7 @@ mount_foreign_callback (GObject *source_object, static void g_hal_volume_mount (GVolume *volume, + GMountMountFlags flags, GMountOperation *mount_operation, GCancellable *cancellable, GAsyncReadyCallback callback, @@ -839,7 +840,8 @@ g_hal_volume_mount (GVolume *volume, data->callback = callback; data->user_data = user_data; - g_file_mount_enclosing_volume (hal_volume->foreign_mount_root, + g_file_mount_enclosing_volume (hal_volume->foreign_mount_root, + 0, mount_operation, cancellable, mount_foreign_callback, @@ -970,7 +972,7 @@ g_hal_volume_enumerate_identifiers (GVolume *volume) /* Null-terminate */ g_ptr_array_add (res, NULL); - return g_ptr_array_free (res, FALSE); + return (char **)g_ptr_array_free (res, FALSE); } static void diff --git a/programs/gvfs-mount.c b/programs/gvfs-mount.c index ea07b0d9..a28b626f 100644 --- a/programs/gvfs-mount.c +++ b/programs/gvfs-mount.c @@ -203,9 +203,9 @@ mount (GFile *file) op = new_mount_op (); if (mount_mountable) - g_file_mount_mountable (file, op, NULL, mount_mountable_done_cb, op); + g_file_mount_mountable (file, 0, op, NULL, mount_mountable_done_cb, op); else - g_file_mount_enclosing_volume (file, op, NULL, mount_done_cb, op); + g_file_mount_enclosing_volume (file, 0, op, NULL, mount_done_cb, op); outstanding_mounts++; } diff --git a/programs/gvfs-open.c b/programs/gvfs-open.c index 068c93c0..5fa441fc 100644 --- a/programs/gvfs-open.c +++ b/programs/gvfs-open.c @@ -40,13 +40,6 @@ static GOptionEntry entries[] = { {NULL} }; -static GAppInfo * -get_default_appinfo_for_file (GFile *file, - GCancellable *cancellable, - GError **error) -{ -} - static void open (GFile *file, char *arg_string) { |